Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- enable 32-bit library builds on amd64 and sparc64

Browse Source 
- add 3 new top-level targets:
    do-compat-lib-csu
    do-compat-libgcc
    do-compat-lib-libc
  and run them before "do-build" if ${MKCOMPAT} != "no"
This commit is contained in:
mrg 2008-10-27 22:32:51 +00:00
parent 428393080e
commit bafe7cb90b
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.261 2008/10/25 15:03:44 apb Exp $
# $NetBSD: Makefile,v 1.262 2008/10/27 22:32:51 mrg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@ -95,6 +95,13 @@
# do-sys-rump-fs-lib: builds and installs prerequisites from sys/rump/fs/lib
# do-sys-rump-net-lib: builds and installs prerequisites from sys/rump/net/lib
# do-ld.so: builds and installs prerequisites from libexec/ld.*_so.
# do-compat-lib-csu: builds and installs prerequisites from compat/lib/csu
# if ${MKCOMPAT} != "no".
# do-compat-libgcc: builds and installs prerequisites from
# compat/gnu/lib/crtstuff${LIBGCC_EXT} (if necessary) and
# compat/gnu/lib/libgcc${LIBGCC_EXT} if ${MKCOMPAT} != "no".
# do-compat-lib-libc: builds and installs prerequisites from compat/lib/libc
# if ${MKCOMPAT} != "no".
# do-build: builds and installs the entire system.
# do-x11: builds and installs X11; either
# X11R7 from src/external/mit/xorg if ${MKXORG} != "no"
@ -136,7 +143,7 @@ _SRC_TOP_OBJ_=
# BUILD_${dir}=no, or that have no ${dir}/Makefile.
#
_SUBDIR= tools lib include gnu external bin games libexec sbin usr.bin
_SUBDIR+= usr.sbin share rescue sys etc tests .WAIT distrib regress
_SUBDIR+= usr.sbin share rescue sys etc tests compat .WAIT distrib regress
.for dir in ${_SUBDIR}
.if "${dir}" == ".WAIT" \
@ -228,6 +235,11 @@ BUILDTARGET+= do-libpcc
BUILDTARGETS+= do-lib-libc
BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
BUILDTARGETS+= do-sys-rump-fs-lib do-sys-rump-net-lib
.if ${MKCOMPAT} != "no"
BUILDTARGETS+= do-compat-lib-csu
BUILDTARGETS+= do-compat-libgcc
BUILDTARGETS+= do-compat-lib-libc
.endif
BUILDTARGETS+= do-ld.so
BUILDTARGETS+= do-build
.if ${MKX11} != "no" || ${MKXORG} != "no"
@ -385,7 +397,13 @@ BUILD_CC_LIB+= external/bsd/pcc/crtstuff
BUILD_CC_LIB+= external/bsd/pcc/libpcc
.endif
.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib sys/rump/net/lib
.if ${MKCOMPAT} != "no"
BUILD_COMPAT_LIBS= compat/lib/csu ${BUILD_CC_LIB:S/^/compat\//} compat/lib/libc
.else
BUILD_COMPAT_LIBS=
.endif
.for dir in tools tools/compat lib/csu ${BUILD_CC_LIB} lib/libc lib/libdes lib gnu/lib external/lib sys/rump/fs/lib sys/rump/net/lib ${BUILD_COMPAT_LIBS}
do-${dir:S/\//-/g}: .PHONY .MAKE
.for targ in dependall install
${MAKEDIRTARGET} ${dir} ${targ}
@ -408,6 +426,14 @@ do-libgcc: .PHONY .MAKE
.endif
.endif
do-compat-libgcc: .PHONY .MAKE
.if defined(HAVE_GCC)
.if ${MKGCC} != "no"
${MAKEDIRTARGET} . do-compat-gnu-lib-crtstuff${LIBGCC_EXT}
${MAKEDIRTARGET} . do-compat-gnu-lib-libgcc${LIBGCC_EXT}
.endif
.endif
do-libpcc: .PHONY .MAKE
.if defined(HAVE_PCC)
.if ${MKPCC} != "no"

4
share/mk/bsd.own.mk
View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.538 2008/10/26 23:13:24 apb Exp $
# $NetBSD: bsd.own.mk,v 1.539 2008/10/27 22:32:51 mrg Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@ -621,8 +621,6 @@ MK${var}:= yes
.endif
.endfor
# XXX for now.
MKCOMPAT?= no
#
# MK* options which have variable defaults.
#