d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change !defined(NOAOUT) knob to defined(WANT_AOUT).

Browse Source
This commit is contained in:
David E. O'Brien 1999-03-29 10:59:53 +00:00
parent 6350e58a8a
commit 990cbc6448
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,5 +1,5 @@
#
# $Id: Makefile,v 1.224 1999/02/17 20:56:09 msmith Exp $
# $Id: Makefile,v 1.225 1999/03/20 20:10:19 jkh Exp $
#
# The user-driven targets are:
#
@ -52,7 +52,7 @@
# or 3.0. If OBJFORMAT is set as an environment variable or in /etc/make.conf,
# this overrides /etc/objformat.
#
# Unless -DNOAOUT is specified, a `make world' with OBJFORMAT=elf will
# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will
# update the legacy support for aout. This includes all libraries, ld.so
# and boot objects. This part of build should be regarded as
# deprecated and you should _not_ expect to be able to do this past the

10
Makefile.inc0
View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.inc0,v 1.13 1998/12/20 14:30:08 jhay Exp $
# $Id: Makefile.inc0,v 1.14 1999/01/14 06:45:53 jhay Exp $
#
# This makefile ensures that the object directory is set according to the
# object format to avoid mixing aout and elf formatted files during the
@ -78,11 +78,11 @@ world:
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} pre-world
.endif
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build
.endif
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} -B installworld
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-install
.endif
.if target(post-world)
@ -105,7 +105,7 @@ world:
#
buildworld :
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} buildworld
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} legacy-build
.endif
@ -117,6 +117,6 @@ buildworld :
#
installworld :
@cd ${.CURDIR}; ${MK_ENV} ${MAKE} installworld
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && !defined(NOAOUT)
.if ${MACHINE_ARCH} == "i386" && ${OBJFORMAT} == "elf" && defined(WANT_AOUT)
@cd ${.CURDIR}; ${LEGACY_ENV} ${XMAKE} -DNOMAN -DNOINFO legacy-install
.endif