diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
| commit | 3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6 (patch) | |
| tree | 776c9b339eb020689b024842cc56784cbe75e14d /libexec | |
| parent | de52e5bdca088414f71d5faecfd7ccb42b4988d1 (diff) | |
| download | src-3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6.tar.gz src-3c89d6b0e37f4c8fd151aa06bc7af33d74fb54b6.zip | |
Don't override LIB*DIR variables from src.libnames.mk.
In some cases switch to the LIB*SRCDIR value.
These recently were defined in r291327 and r291619.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291620
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 5667299cc4e3..2d2a003b380c 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -13,9 +13,8 @@ SRCS= rtld_start.S \ malloc.c xmalloc.c debug.c libmap.c MAN= rtld.1 CSTD?= gnu99 -TOPSRCDIR= ${.CURDIR}/../.. CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -CFLAGS+= -I${TOPSRCDIR}/lib/csu/common +CFLAGS+= -I${SRCTOP}/lib/csu/common .if exists(${.CURDIR}/${MACHINE_ARCH}) RTLD_ARCH= ${MACHINE_ARCH} .else @@ -59,8 +58,7 @@ LIBADD+= compiler_rt .if ${MK_SYMVER} == "yes" -LIBCDIR= ${TOPSRCDIR}/lib/libc -VERSION_DEF= ${LIBCDIR}/Versions.def +VERSION_DEF= ${LIBCSRCDIR}/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_MAP= Version.map LDFLAGS+= -Wl,--version-script=${VERSION_MAP} |