linux-vax-tools-commit

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14603

Modified Files:
	build_toolchain.sh 
Log Message:
- Use GNU make throughoutly.


Index: build_toolchain.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/build_toolchain.sh,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- build_toolchain.sh	31 Dec 2005 17:22:08 -0000	1.51
+++ build_toolchain.sh	5 Jan 2006 17:54:46 -0000	1.52
@@ -36,6 +36,13 @@
 	fi
 done
 
+#
+# Find a working `make' program
+#
+case "`uname -s`" in
+	Linux)	MAKE=make;;
+	*)	MAKE=gmake;;
+esac
 
 #
 # -Werror behavior
@@ -503,9 +510,9 @@
 			${WERROR}
 
 	# Build
-	build "${BUILD_BINUTILS}" &&	execute make ${MAKEFLAGS} all-binutils
-	build "${BUILD_LD}" &&		execute make ${MAKEFLAGS} all-ld
-	build "${BUILD_GAS}" &&		execute make ${MAKEFLAGS} all-gas
+	build "${BUILD_BINUTILS}" &&	execute ${MAKE} ${MAKEFLAGS} all-binutils
+	build "${BUILD_LD}" &&		execute ${MAKE} ${MAKEFLAGS} all-ld
+	build "${BUILD_GAS}" &&		execute ${MAKE} ${MAKEFLAGS} all-gas
 
 	# Check. We check twice because (of unknown reasons), the first
 	# run occassionally fails on my box (either some script just before
@@ -513,27 +520,27 @@
 	# after one run is done). So this is a FIXME.
 	build "${BUILD_BINUTILS}" &&			\
 		build "${DO_CHECKS_BINUTILS}" &&	\
-		execute make ${MAKEFLAGS} check-binutils || true
+		execute ${MAKE} ${MAKEFLAGS} check-binutils || true
 	build "${BUILD_BINUTILS}" &&			\
 		build "${DO_CHECKS_BINUTILS}" &&	\
-		execute make ${MAKEFLAGS} check-binutils || true
+		execute ${MAKE} ${MAKEFLAGS} check-binutils || true
 	build "${BUILD_LD}" &&				\
 		build "${DO_CHECKS_BINUTILS}" &&	\
-		execute make ${MAKEFLAGS} check-ld || true
+		execute ${MAKE} ${MAKEFLAGS} check-ld || true
 	build "${BUILD_LD}" &&				\
 		build "${DO_CHECKS_BINUTILS}" &&	\
-		execute make ${MAKEFLAGS} check-ld || true
+		execute ${MAKE} ${MAKEFLAGS} check-ld || true
 	build "${BUILD_GAS}" &&				\
 		build "${DO_CHECKS_BINUTILS}" &&	\
-		execute make ${MAKEFLAGS} check-gas || true
+		execute ${MAKE} ${MAKEFLAGS} check-gas || true
 	build "${BUILD_GAS}" &&				\
 		build "${DO_CHECKS_BINUTILS}" &&	\
-		execute make ${MAKEFLAGS} check-gas || true
+		execute ${MAKE} ${MAKEFLAGS} check-gas || true
 
 	# Install
-	build "${BUILD_BINUTILS}" &&	execute make ${MAKEFLAGS} install-binutils
-	build "${BUILD_LD}" &&		execute make ${MAKEFLAGS} install-ld
-	build "${BUILD_GAS}" &&		execute make ${MAKEFLAGS} install-gas
+	build "${BUILD_BINUTILS}" &&	execute ${MAKE} ${MAKEFLAGS} install-binutils
+	build "${BUILD_LD}" &&		execute ${MAKE} ${MAKEFLAGS} install-ld
+	build "${BUILD_GAS}" &&		execute ${MAKE} ${MAKEFLAGS} install-gas
 
 	# Create a test summary to be sent as a proof that the vax-linux
 	# community exists and is still alive.
@@ -569,10 +576,10 @@
 			#--without-headers
 
 	# Build
-	build "${BUILD_GCC1}" &&	execute make ${MAKEFLAGS} all-gcc
+	build "${BUILD_GCC1}" &&	execute ${MAKE} ${MAKEFLAGS} all-gcc
 
 	# Install
-	build "${BUILD_GCC1}" &&	execute make ${MAKEFLAGS} install-gcc
+	build "${BUILD_GCC1}" &&	execute ${MAKE} ${MAKEFLAGS} install-gcc
 popd
 
 #
@@ -584,8 +591,8 @@
 # Configure the kernel. We need prepared kernel headers.
 #
 pushd "${LINUX_SRC}"
-	execute make V=1 ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${TARGET}-" defconfig
-	execute make V=1 ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${TARGET}-" prepare
+	execute ${MAKE} V=1 ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${TARGET}-" defconfig
+	execute ${MAKE} V=1 ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${TARGET}-" prepare
 popd
 
 #
@@ -603,21 +610,21 @@
 
 		# Prepare
 		build "${BUILD_UCLIBC}" &&	execute ./extra/scripts/create_makefiles.sh
-		build "${BUILD_UCLIBC}" &&	(yes "" | execute make oldconfig;)
+		build "${BUILD_UCLIBC}" &&	(yes "" | execute ${MAKE} oldconfig;)
 
 		# Build
-		# build "${BUILD_GCC1}" &&	(yes "" | execute make ${MAKEFLAGS};)
-		build "${BUILD_UCLIBC}" &&	execute make headers
-		build "${BUILD_UCLIBC}" &&	execute make ${MAKEFLAGS} V=1
+		# build "${BUILD_GCC1}" &&	(yes "" | execute ${MAKE} ${MAKEFLAGS};)
+		build "${BUILD_UCLIBC}" &&	execute ${MAKE} V=1 headers
+		build "${BUILD_UCLIBC}" &&	execute ${MAKE} ${MAKEFLAGS} V=1
 
 		# Install
-		build "${BUILD_UCLIBC}" &&	execute make install
-		build "${BUILD_UCLIBC}" &&	execute make DEVEL_PREFIX="${INSTALL_NATIVE_BASE}/usr/${TARGET}/" install
+		build "${BUILD_UCLIBC}" &&	execute ${MAKE} V=1 install
+		build "${BUILD_UCLIBC}" &&	execute ${MAKE} V=1 DEVEL_PREFIX="${INSTALL_NATIVE_BASE}/usr/${TARGET}/" install
 
 		case "${TARGET}" in
 			vax-*)
 				pushd "${UCLIBC_SRC}/libm-vax"
-					execute make TARGET="${TARGET}-" libm.a
+					execute ${MAKE} TARGET="${TARGET}-" libm.a
 					execute cp "${INSTALL_BASE}/usr/${TARGET}/lib/lib/libm.a" \
 						"${INSTALL_BASE}/usr/${TARGET}/lib/lib/libm-uClibc.a"
 					execute cp libm.a "${INSTALL_BASE}/usr/${TARGET}/lib/lib/"
@@ -664,7 +671,7 @@
 		# exit, because this won't work and thus there's no native
 		# compiler based on glibc...
 		#
-		execute make || true
+		execute ${MAKE} || true
 		echo "" >&2
 		echo "WARNING: This build is was faked to be okay" >&2
 		echo "" >&2
@@ -680,7 +687,7 @@
 	# Check
 	build "${BUILD_GCC1}" &&		\
 		build "${DO_CHECKS_GCC}" &&	\
-		execute make ${MAKEFLAGS} check-gcc || true
+		execute ${MAKE} ${MAKEFLAGS} check-gcc || true
 
 	# Create a test summary to be sent as a proof that the vax-linux
 	# community exists and is still alive.
@@ -702,23 +709,23 @@
 
 	# Build
 	build "${BUILD_BINUTILS}" &&	ac_cv_func_strncmp_works=yes	\
-						execute make ${MAKEFLAGS} all-binutils
+						execute ${MAKE} ${MAKEFLAGS} all-binutils
 	build "${BUILD_BINUTILS}" &&	ac_cv_func_strncmp_works=yes	\
-						execute make ${MAKEFLAGS} all-gas
+						execute ${MAKE} ${MAKEFLAGS} all-gas
 	build "${BUILD_BINUTILS}" &&	ac_cv_func_strncmp_works=yes	\
-						execute make ${MAKEFLAGS} all-ld
+						execute ${MAKE} ${MAKEFLAGS} all-ld
 
 	# Install
 	build "${BUILD_BINUTILS}" &&				\
-		execute make ${MAKEFLAGS}			\
+		execute ${MAKE} ${MAKEFLAGS}			\
 			prefix="${INSTALL_NATIVE_BASE}/usr"	\
 			install-binutils
 	build "${BUILD_LD}" &&					\
-		execute make ${MAKEFLAGS}			\
+		execute ${MAKE} ${MAKEFLAGS}			\
 			prefix="${INSTALL_NATIVE_BASE}/usr"	\
 			install-ld
-	build "${BUILD_GAS}" &&				\
-		execute make ${MAKEFLAGS}			\
+	build "${BUILD_GAS}" &&					\
+		execute ${MAKE} ${MAKEFLAGS}			\
 			prefix="${INSTALL_NATIVE_BASE}/usr"	\
 			install-gas
 popd
@@ -749,7 +756,7 @@
 
 	# Build
 	build "${BUILD_GCC1}" && ac_cv_func_strncmp_works=yes	execute	\
-					make ${MAKEFLAGS} all-gcc
+					${MAKE} ${MAKEFLAGS} all-gcc
 
 	# Install
 	build "${BUILD_GCC1}" &&		\