diff options
| author | gordon <gordon@FreeBSD.org> | 2003-11-16 21:17:43 +0000 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2003-11-16 21:17:43 +0000 |
| commit | 09060c94bcac105d7676c092cbf56a6479e5ece8 (patch) | |
| tree | 328e043054049c98216e54b0adde243dea509478 /Makefile.inc1 | |
| parent | ef5988e7310b686864c980c67227637dd6471559 (diff) | |
| download | FreeBSD-src-09060c94bcac105d7676c092cbf56a6479e5ece8.zip FreeBSD-src-09060c94bcac105d7676c092cbf56a6479e5ece8.tar.gz | |
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
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c51fa40..3e79035 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2,6 +2,7 @@ # $FreeBSD$ # # Make command line options: +# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNO_RESCUE do not build rescue binaries # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -52,7 +53,7 @@ SUBDIR+= lib # When upgrading to a dynamically linked root, install the runtime # linker early into its new location before make(1) has a chance # 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(DISTDIR) && \ (!defined(DESTDIR) || empty(DESTDIR) || ${DESTDIR} == "/") && \ |
