diff options
Diffstat (limited to 'release')
| -rw-r--r-- | release/picobsd/build/Makefile.crunch | 3 | ||||
| -rwxr-xr-x | release/picobsd/build/stage1 | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch index 96ceb15..a473956 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 7fb2f51..42e419d 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 # |
