diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-01 22:20:04 +0000 |
| commit | 5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1 (patch) | |
| tree | 776c9b339eb020689b024842cc56784cbe75e14d /libexec/rtld-elf | |
| parent | 7f302a6c3c76177ad445353041efa95658a26b63 (diff) | |
| download | FreeBSD-src-5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1.zip FreeBSD-src-5a962dd0c6413dda6134b0aee51e4e99a3f6d1c1.tar.gz | |
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
Diffstat (limited to 'libexec/rtld-elf')
| -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 5667299..2d2a003 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} |
