Mercurial > hg > aboriginal
diff root-filesystem.sh @ 726:db5cb617339a
Centrialize BUILD_STATIC and make it apply to more of root-filesystem.sh
author | Rob Landley <rob@landley.net> |
---|---|
date | Thu, 07 May 2009 19:09:56 -0500 |
parents | f0ede6d6c952 |
children | feec13d32dde |
line wrap: on
line diff
--- a/root-filesystem.sh Tue Apr 28 22:38:38 2009 -0500 +++ b/root-filesystem.sh Thu May 07 19:09:56 2009 -0500 @@ -93,8 +93,6 @@ else -[ -z "$BUILD_STATIC" ] || STATIC_FLAGS='--static' - # Build and install native binutils setupfor binutils build-binutils @@ -226,14 +224,15 @@ make defconfig && if [ -z "$USE_TOYBOX" ] then - make CROSS="${ARCH}-" && + CFLAGS="$CFLAGS $STATIC_FLAGS" make CROSS="${ARCH}-" && cp toybox "$TOOLS/bin" && ln -s toybox "$TOOLS/bin/patch" && ln -s toybox "$TOOLS/bin/oneit" && ln -s toybox "$TOOLS/bin/netcat" && cd .. else - make install_flat PREFIX="${TOOLS}"/bin CROSS="${ARCH}-" && + CFLAGS="$CFLAGS $STATIC_FLAGS" \ + make install_flat PREFIX="${TOOLS}"/bin CROSS="${ARCH}-" && cd .. fi @@ -244,7 +243,8 @@ setupfor busybox make allyesconfig KCONFIG_ALLCONFIG="${SOURCES}/trimconfig-busybox" && cp .config "${TOOLS}"/src/config-busybox && -make -j $CPUS CROSS_COMPILE="${ARCH}-" $VERBOSITY && +LDFLAGS="$LDFLAGS $STATIC_FLAGS" \ + make -j $CPUS CROSS_COMPILE="${ARCH}-" $VERBOSITY && make busybox.links && cp busybox "${TOOLS}/bin"