Mercurial > hg > aboriginal

changeset 183:d2a27709d3b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixup the -j stuff to actually work. (typo in gcc, and uClibc can't use it.)
author Rob Landley <rob@landley.net>
date Tue, 26 Jun 2007 21:32:19 -0400
parents fc827ab6166f
children dd60fbdf04c7
files cross-compiler.sh mini-native.sh
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/cross-compiler.sh	Tue Jun 26 17:51:14 2007 -0400
+++ b/cross-compiler.sh	Tue Jun 26 21:32:19 2007 -0400
@@ -37,7 +37,7 @@
 	--prefix="${CROSS}" --host=${CROSS_HOST} --target=${CROSS_TARGET} \
 	--enable-languages=c --disable-threads --disable-multilib \
 	--disable-nls --disable-shared --program-prefix="${ARCH}-" &&
-make -j CPUS all-gcc &&
+make -j $CPUS all-gcc &&
 make install-gcc &&
 cd .. &&
 
@@ -64,7 +64,7 @@
 
 chmod +x fixup-toolchain.sh &&
 ./fixup-toolchain.sh &&
-$CLEANUP "${CURSRC}" build-gcc &&
+$CLEANUP "${CURSRC}" build-gcc
 
 [ $? -ne 0 ] && dienow
 
@@ -82,9 +82,9 @@
 
 setupfor uClibc
 make CROSS= allnoconfig KCONFIG_ALLCONFIG="${WORK}"/miniconfig-uClibc &&
+# Can't use -j here, build is unstable.
 make CROSS="${ARCH}-" KERNEL_HEADERS="${CROSS}/include" PREFIX="${CROSS}/" \
-	RUNTIME_PREFIX=/ DEVEL_PREFIX=/ -j $CPUS all install_runtime \
-	install_dev &&
+	RUNTIME_PREFIX=/ DEVEL_PREFIX=/ all install_runtime install_dev &&
 # "make utils" in uClibc is broken for cross compiling.  Either it creates a
 # target binary (which you can't run on the host), or it tries to link the
 # host binary against the target library, and use the target compiler flags
--- a/mini-native.sh	Tue Jun 26 17:51:14 2007 -0400
+++ b/mini-native.sh	Tue Jun 26 21:32:19 2007 -0400
@@ -35,9 +35,10 @@
 
 setupfor uClibc
 make allnoconfig KCONFIG_ALLCONFIG="${WORK}/miniconfig-uClibc" &&
+# Can't use -j here, build is unstable.
 make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" PREFIX="${TOOLS}/" \
         RUNTIME_PREFIX=/ DEVEL_PREFIX=/ UCLIBC_LDSO_NAME=ld-uClibc \
-        -j $CPUS all install_runtime install_dev utils &&
+        all install_runtime install_dev utils &&
 # utils_install wants to put stuff in usr/bin instead of bin.
 install -m 755 utils/{readelf,ldd,ldconfig} "${TOOLS}/bin" &&
 cd .. &&
@@ -148,7 +149,8 @@
 CC="${ARCH}-gcc" RANLIB="${ARCH}-ranlib" ./configure --prefix="${TOOLS}" \
   --build="${CROSS_HOST}" --host="${CROSS_TARGET}" --cache-file=config.cache \
   --without-bash-malloc --disable-readline &&
-make -j $CPUS &&
+# note: doesn't work with -j
+make &&
 make install &&
 # Make bash the default shell.
 ln -s bash "${TOOLS}/bin/sh" &&