clean up a bit; also fix a snap_pre_md segment to be in snap_md_pre so it is actually executed.
This commit is contained in:
parent
d8ebb0682c
commit
a826a2ecf0
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.inc,v 1.9 2001/08/23 14:40:21 mrg Exp $
|
||||
# $NetBSD: Makefile.inc,v 1.10 2001/08/23 16:01:56 mrg Exp $
|
||||
#
|
||||
# etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
|
||||
#
|
||||
@ -7,24 +7,14 @@ TOP= $(.CURDIR)/..
|
||||
|
||||
# Set this for any kernels beyond GENERIC you want to include
|
||||
# in the distribution.
|
||||
#EXTRA_KERNELS+= POWEROFSEVEN
|
||||
BUILD_KERNELS+= INSTALL
|
||||
|
||||
|
||||
# Add sparc64 installation directories
|
||||
MD_INSTALLATION_DIRS= \
|
||||
installation/miniroot installation/netboot installation/misc
|
||||
INSTALLATION_DIRS+=$(MD_INSTALLATION_DIRS)
|
||||
|
||||
snap_pre_md:
|
||||
.ifndef UPDATE
|
||||
cd $(TOP)/distrib && ${MAKE} clean
|
||||
.endif
|
||||
|
||||
#
|
||||
# Build 32 bit lib/csu, lib, gnu/lib & libexec/ld.elf_so
|
||||
#
|
||||
.if (${MACHINE_ARCH} == sparc64 && ${MACHINE} == sparc64 && ${MK32BITLIBS} == yes)
|
||||
# Used by 32 bit lib/csu, lib, gnu/lib & libexec/ld.elf_so
|
||||
LIBDIR=/usr/lib/sparcv7
|
||||
BINDIR=/usr/libexec/sparcv7
|
||||
SPARC32=COPTS=-m32 LD="ld -m elf32_sparc" AS="as -32" \
|
||||
@ -33,6 +23,14 @@ SPARC32=COPTS=-m32 LD="ld -m elf32_sparc" AS="as -32" \
|
||||
SHLIB_LDENDFILE=${DESTDIR}${LIBDIR}/crtendS.o
|
||||
|
||||
snap_md_pre:
|
||||
.ifndef UPDATE
|
||||
# clean up the distrib area
|
||||
cd $(TOP)/distrib && ${MAKE} clean
|
||||
.endif
|
||||
|
||||
.if (${MACHINE_ARCH} == sparc64 && ${MACHINE} == sparc64 && ${MK32BITLIBS} == yes)
|
||||
|
||||
# build 32 bit csu
|
||||
.if ${MKOBJDIRS} != "no"
|
||||
(cd ${.CURDIR}/../lib/csu && \
|
||||
${MAKE} ${SPARC32} ${_M} obj)
|
||||
@ -40,6 +38,8 @@ snap_md_pre:
|
||||
(cd ${.CURDIR}/../lib/csu && \
|
||||
${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
|
||||
${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
|
||||
|
||||
# build 32 bit libraries
|
||||
.if ${MKOBJDIRS} != "no"
|
||||
(cd ${.CURDIR}/../lib && \
|
||||
${MAKE} ${SPARC32} ${_M} obj)
|
||||
@ -47,6 +47,8 @@ snap_md_pre:
|
||||
(cd ${.CURDIR}/../lib && \
|
||||
${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
|
||||
${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
|
||||
|
||||
# build 32 bit gnu libraries
|
||||
.if ${MKOBJDIRS} != "no"
|
||||
(cd ${.CURDIR}/../gnu/lib && \
|
||||
${MAKE} ${SPARC32} ${_M} obj)
|
||||
@ -54,6 +56,8 @@ snap_md_pre:
|
||||
(cd ${.CURDIR}/../gnu/lib && \
|
||||
${MAKE} ${SPARC32} ${_M} ${_J} MKSHARE=no dependall && \
|
||||
${MAKE} ${SPARC32} ${_M} MKSHARE=no install)
|
||||
|
||||
# build 32 bit ld.elf_so
|
||||
.if ${MKOBJDIRS} != "no"
|
||||
(cd ${.CURDIR}/../libexec/ld.elf_so && \
|
||||
${MAKE} ${SPARC32} ${_M} obj)
|
||||
@ -78,7 +82,7 @@ snap_md_post:
|
||||
(cd $(TOP)/distrib; ${MAKE})
|
||||
|
||||
# transfer images to release hierarchy
|
||||
.for dir in notes sparc64/xminiroot
|
||||
.for dir in notes sparc64/xminiroot sparc64/instfs
|
||||
(cd $(TOP)/distrib/$(dir); ${MAKE} release)
|
||||
.endfor
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user