diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2019-11-07 19:22:51 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2019-11-07 19:22:51 +0000 |
| commit | ccad77fe1e02fa2559819bab262d9fd034a8dcac (patch) | |
| tree | 2465ac4731266a83a46ac192acb0381cfce55230 /libexec | |
| parent | 5270e1a584afb9122951917d0467fb236676c0ce (diff) | |
| download | src-test2-ccad77fe1e02fa2559819bab262d9fd034a8dcac.tar.gz src-test2-ccad77fe1e02fa2559819bab262d9fd034a8dcac.zip | |
Notes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/Makefile | 1 | ||||
| -rw-r--r-- | libexec/rtld-elf/Makefile | 20 | ||||
| -rw-r--r-- | libexec/rtld-elf32/Makefile | 10 |
3 files changed, 8 insertions, 23 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 4ac65066619d..89688daafb59 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -74,7 +74,6 @@ _tftp-proxy= tftp-proxy .if !defined(NO_PIC) && !defined(NO_RTLD) _rtld-elf= rtld-elf -SUBDIR.${MK_LIB32}+= rtld-elf32 .endif .if ${MK_RBOOTD} != "no" diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 67ec1eb35cb0..0bbfbb89301e 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -4,8 +4,6 @@ # linker: # make DEBUG_FLAGS=-g WITHOUT_TESTS=yes all -RTLD_ELF_DIR:= ${.PARSEDIR} - .include <src.opts.mk> PACKAGE= clibs MK_PIE= no # Always position independent using local rules @@ -27,16 +25,16 @@ SRCS= \ xmalloc.c \ debug.c \ libmap.c -MAN?= rtld.1 +MAN= rtld.1 CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD -ffreestanding CFLAGS+= -I${SRCTOP}/lib/csu/common -.if exists(${RTLD_ELF_DIR}/${MACHINE_ARCH}) +.if exists(${.CURDIR}/${MACHINE_ARCH}) RTLD_ARCH= ${MACHINE_ARCH} .else RTLD_ARCH= ${MACHINE_CPUARCH} .endif -CFLAGS+= -I${RTLD_ELF_DIR}/${RTLD_ARCH} -I${RTLD_ELF_DIR} +CFLAGS+= -I${.CURDIR}/${RTLD_ARCH} -I${.CURDIR} .if ${MACHINE_ARCH} == "powerpc64" LDFLAGS+= -nostdlib -e _rtld_start .else @@ -83,16 +81,16 @@ LIBADD+= compiler_rt .if ${MK_SYMVER} == "yes" VERSION_DEF= ${LIBCSRCDIR}/Versions.def -SYMBOL_MAPS= ${RTLD_ELF_DIR}/Symbol.map +SYMBOL_MAPS= ${.CURDIR}/Symbol.map VERSION_MAP= Version.map LDFLAGS+= -Wl,--version-script=${VERSION_MAP} -.if exists(${RTLD_ELF_DIR}/${RTLD_ARCH}/Symbol.map) -SYMBOL_MAPS+= ${RTLD_ELF_DIR}/${RTLD_ARCH}/Symbol.map +.if exists(${.CURDIR}/${RTLD_ARCH}/Symbol.map) +SYMBOL_MAPS+= ${.CURDIR}/${RTLD_ARCH}/Symbol.map .endif .endif -.sinclude "${RTLD_ELF_DIR}/${RTLD_ARCH}/Makefile.inc" +.sinclude "${.CURDIR}/${RTLD_ARCH}/Makefile.inc" # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. @@ -101,12 +99,10 @@ beforeinstall: -chflags -h noschg ${DESTDIR}/usr/libexec/${PROG} .endif -.PATH: ${RTLD_ELF_DIR}/${RTLD_ARCH} +.PATH: ${.CURDIR}/${RTLD_ARCH} -.if ${.CURDIR} == ${RTLD_ELF_DIR} HAS_TESTS= SUBDIR.${MK_TESTS}+= tests -.endif .include <bsd.prog.mk> ${PROG_FULL}: ${VERSION_MAP} diff --git a/libexec/rtld-elf32/Makefile b/libexec/rtld-elf32/Makefile deleted file mode 100644 index 5b4c2e9c4007..000000000000 --- a/libexec/rtld-elf32/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -NEED_COMPAT= 32 -.include <bsd.compat.mk> - -PROG= ld-elf32.so.1 -MAN= - -.PATH: ${SRCTOP}/libexec/rtld-elf -.include "${SRCTOP}/libexec/rtld-elf/Makefile" |