Invert the condition that installs the dynamic linker early, since
DYNAMICROOT is now the default. Also document -DNO_DYNAMICROOT since that is going to be a documented feature. Submitted by: matusita, rushani
This commit is contained in:
parent
ab9c99bd65
commit
5257abea22
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=122813
@ -2,6 +2,7 @@
|
|||||||
# $FreeBSD$
|
# $FreeBSD$
|
||||||
#
|
#
|
||||||
# Make command line options:
|
# Make command line options:
|
||||||
|
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
|
||||||
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
|
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
|
||||||
# -DNO_RESCUE do not build rescue binaries
|
# -DNO_RESCUE do not build rescue binaries
|
||||||
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
|
# -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
|
||||||
@ -52,7 +53,7 @@ SUBDIR+= lib
|
|||||||
# When upgrading to a dynamically linked root, install the runtime
|
# When upgrading to a dynamically linked root, install the runtime
|
||||||
# linker early into its new location before make(1) has a chance
|
# linker early into its new location before make(1) has a chance
|
||||||
# to run the dynamically linked /bin/sh.
|
# to run the dynamically linked /bin/sh.
|
||||||
.if defined(WITH_DYNAMICROOT) && !defined(NOPIC) && \
|
.if !defined(NO_DYNAMICROOT) && !defined(NOPIC) && \
|
||||||
(!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
|
(!defined(TARGET_ARCH) || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \
|
||||||
!defined(DISTDIR) && \
|
!defined(DISTDIR) && \
|
||||||
(!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \
|
(!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \
|
||||||
|
Loading…
Reference in New Issue
Block a user