From: Brad House <brad_mssw@gentoo.org>
Date: Tue, 9 Dec 2003 20:51:07 +0000 (+0000)
Subject: different makes for kernel and utils
X-Git-Tag: v3.4.10.902~735
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96de22c65a9f40d1a0e248011350a08a50930e49;p=genkernel.git

different makes for kernel and utils


git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@17 67a159dc-881f-0410-a524-ba9dfbe2cb84
---

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index 94580f7..19ef7fb 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -26,10 +26,11 @@ usage() {
   echo "	--kernel-cc=<compiler>	Compiler to use for kernel (e.g. distcc)"
   echo "	--kernel-ld=<linker>	Linker to use for kernel"
   echo "	--kernel-as=<assembler>	Assembler to use for kernel"
+  echo "	--kernel-make=<makeprg> GNU Make to use for kernel"
   echo "	--utils-cc=<compiler>	Compiler to use for utils (e.g. busybox, modutils)"
   echo "	--utils-ld=<linker>	Linker to use for utils"
   echo "	--utils-as=<assembler>	Assembler to use for utils"
-  echo "	--make=<make prog>	GNU Make to use"
+  echo "	--utils-make=<makeprog>	GNU Make to use for utils"
   echo "  Internals"
   echo "	--arch-override=<arch>	Force to arch instead of autodetect (cross-compile?)"
   echo "	--busybox-config=<file>	Busybox configuration file to use"
@@ -65,6 +66,10 @@ parse_cmdline() {
 				CMD_KERNEL_AS=`parse_opt "${x}"`
 				print_info 2 "CMD_KERNEL_AS: $CMD_KERNEL_AS"
 			;;
+			--kernel-make*)
+				CMD_KERNEL_MAKE=`parse_opt "${x}"`
+				print_info 2 "CMD_KERNEL_MAKE: $CMD_KERNEL_MAKE"
+			;;
 			--utils-cc*)
 				CMD_UTILS_CC=`parse_opt "${x}"`
 				print_info 2 "CMD_UTILS_CC: $CMD_UTILS_CC"
@@ -77,9 +82,9 @@ parse_cmdline() {
 				CMD_UTILS_AS=`parse_opt "${x}"`
 				print_info 2 "CMD_UTILS_AS: $CMD_UTILS_AS"
 			;;
-			--make*)
-				CMD_MAKE=`parse_opt "${x}"`
-				print_info 2 "CMD_MAKE: $CMD_MAKE"
+			--utils-make*)
+				CMD_UTILS_MAKE=`parse_opt "${x}"`
+				print_info 2 "CMD_UTILS_MAKE: $CMD_UTILS_MAKE"
 			;;
 			
 			--debuglevel*)
diff --git a/gen_compile.sh b/gen_compile.sh
index 6f699ca..5a42e54 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -118,9 +118,11 @@ compile_generic() {
 	if [ "${2}" = "kernel" ]
 	then
 		export_kernel_args
+		MAKE=${KERNEL_MAKE}
 	elif [ "${2}" = "utils" ]
 	then
 		export_utils_args
+		MAKE=${UTILS_MAKE}
 	fi
 
 	if [ "${DEBUGLEVEL}" -gt "1" ]
@@ -137,6 +139,7 @@ compile_generic() {
 	fi
 	[ "${RET}" -ne "0" ] && gen_die "compile of failed"
 
+	unset MAKE
 	if [ "${2}" = "kernel" ]
 	then
 		unset_kernel_args
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index a11bdbc..c27249d 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -16,7 +16,6 @@ get_KV() {
 }
 
 determine_real_args() {
-	MAKE="make"
 	MAKEOPTS="-j2"
 	if [ "${CMD_KERNELDIR}" != "" ]
 	then
@@ -28,14 +27,24 @@ determine_real_args() {
 
 	get_KV
 
-	if [ "${CMD_MAKE}" != "" ]
+	if [ "${CMD_KERNEL_MAKE}" != "" ]
 	then
-		MAKE="${CMD_MAKE}"
+		KERNEL_MAKE="${CMD_KERNEL_MAKE}"
 	fi
 
-	if [ "${MAKE}" = "" ]
+	if [ "${KERNEL_MAKE}" = "" ]
 	then
-		MAKE="make"
+		KERNEL_MAKE="make"
+	fi
+
+	if [ "${CMD_UTILS_MAKE}" != "" ]
+	then
+		UTILS_MAKE="${CMD_UTILS_MAKE}"
+	fi
+
+	if [ "${UTILS_MAKE}" = "" ]
+	then
+		UTILS_MAKE="make"
 	fi
 
 	if [ "${CMD_KERNEL_CC}" != "" ]
diff --git a/x86/config.sh b/x86/config.sh
index b29ebf3..504cf26 100644
--- a/x86/config.sh
+++ b/x86/config.sh
@@ -9,7 +9,8 @@ KERNEL_BINARY="arch/i386/boot/bzImage"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
-MAKE=make
+KERNEL_MAKE=make
+UTILS_MAKE=make
 
 KERNEL_CC=gcc
 KERNEL_AS=as
diff --git a/x86_64/config.sh b/x86_64/config.sh
index df2af7a..c063ad1 100644
--- a/x86_64/config.sh
+++ b/x86_64/config.sh
@@ -7,7 +7,8 @@ KERNEL_BINARY="arch/x86_64/boot/bzImage"
 
 USE_DIETLIBC=1
 
-MAKE=make
+KERNEL_MAKE=make
+UTILS_MAKE=make
 
 KERNEL_CC=gcc
 KERNEL_AS=as