aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Karthauser <joe@FreeBSD.org>2000-11-02 13:38:10 +0000
committerJosef Karthauser <joe@FreeBSD.org>2000-11-02 13:38:10 +0000
commitbe0d2a8f18fd53ec07e372d67a9b1131ddffdc33 (patch)
treec8e7cc14020bcc54be86dbb5cf611fb4f6cefd46
parentcaab6fc8a594d2a0e3e12703a23e584d124d0ac0 (diff)
downloadsrc-be0d2a8f18fd53ec07e372d67a9b1131ddffdc33.tar.gz
src-be0d2a8f18fd53ec07e372d67a9b1131ddffdc33.zip
Build picobsd object files in /usr/obj/picobsd/${TYPE}.
Notes
Notes: svn path=/head/; revision=68242
-rw-r--r--release/picobsd/build/Makefile.crunch3
-rwxr-xr-xrelease/picobsd/build/stage13
2 files changed, 5 insertions, 1 deletions
diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch
index 96ceb1522803..a473956be180 100644
--- a/release/picobsd/build/Makefile.crunch
+++ b/release/picobsd/build/Makefile.crunch
@@ -13,13 +13,14 @@ crunch:
else \
crunchgen -h ../../build/crunch.inc ./crunch1.conf ; \
fi )
+ @perl -pi -e 's#${OBJ}#${PICO_OBJ}#g' crunch1.mk ;
../../build/munge_crunchmk.pl crunch1.mk ;
@( if [ -f buildopts.inc ] ; then \
echo '.include "buildopts.inc"' > crunch1.mk.tmp ; \
cat crunch1.mk >> crunch1.mk.tmp ; \
mv crunch1.mk.tmp crunch1.mk ; \
fi )
- ${MAKE} -f crunch1.mk $(CRUNCHFLAGS) all \
+ @env MAKEOBJDIRPREFIX=${PICO_OBJ} ${MAKE} -f crunch1.mk $(CRUNCHFLAGS) all \
"CFLAGS=${CFLAGS} ${CRUNCHFLAGS}" #2>&1 >/dev/null
strip --remove-section=.note --remove-section=.comment crunch1
diff --git a/release/picobsd/build/stage1 b/release/picobsd/build/stage1
index 7fb2f5185ed5..42e419d9fb8c 100755
--- a/release/picobsd/build/stage1
+++ b/release/picobsd/build/stage1
@@ -14,6 +14,9 @@ MFS_NAME=fs.PICOBSD
MFS_MOUNTPOINT=`mktemp -d "/tmp/picobsd.XXXXXXXXXX"`
export MFS_MOUNTPOINT
+PICO_OBJ=${OBJ}/picobsd/${TYPE}
+export PICO_OBJ
+
# fail errno errcode
# This function is used to trap errors and print msgs
#