aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.libcompat
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2019-11-07 19:22:51 +0000
committerBrooks Davis <brooks@FreeBSD.org>2019-11-07 19:22:51 +0000
commitccad77fe1e02fa2559819bab262d9fd034a8dcac (patch)
tree2465ac4731266a83a46ac192acb0381cfce55230 /Makefile.libcompat
parent5270e1a584afb9122951917d0467fb236676c0ce (diff)
downloadsrc-ccad77fe1e02fa2559819bab262d9fd034a8dcac.tar.gz
src-ccad77fe1e02fa2559819bab262d9fd034a8dcac.zip
Revert r354449: libcompat: build 32-bit rtld and ldd as part of "everything"
Additional testing is required..
Notes
Notes: svn path=/head/; revision=354465
Diffstat (limited to 'Makefile.libcompat')
-rw-r--r--Makefile.libcompat20
1 files changed, 19 insertions, 1 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat
index 21e5fb4296a6..6481ba73ddd1 100644
--- a/Makefile.libcompat
+++ b/Makefile.libcompat
@@ -111,10 +111,28 @@ build${libcompat}: .PHONY
.endfor
${_+_}cd ${.CURDIR}; \
${LIBCOMPATWMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
+.if ${libcompat} == "32"
+.for _t in ${_obj} all
+.if !defined(NO_RTLD)
+ ${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIBCOMPATWMAKE} \
+ -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
+.endif
+ ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATWMAKE} \
+ DIRPRFX=usr.bin/ldd ${_t}
+.endfor
+.endif
distribute${libcompat} install${libcompat}: .PHONY
.for _dir in ${_LC_LIBDIRS.yes}
${_+_}cd ${.CURDIR}/${_dir}; ${LIBCOMPATIMAKE} ${.TARGET:S/${libcompat}$//}
.endfor
+.if ${libcompat} == "32"
+.if !defined(NO_RTLD)
+ ${_+_}cd ${.CURDIR}/libexec/rtld-elf; \
+ PROG=ld-elf32.so.1 ${LIBCOMPATIMAKE} ${.TARGET:S/32$//}
+.endif
+ ${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIBCOMPATIMAKE} \
+ ${.TARGET:S/32$//}
+.endif
-.endif # !targets(__<${_this:T}>__)
+.endif