From: Brad House <brad_mssw@gentoo.org>
Date: Tue, 9 Dec 2003 20:21:06 +0000 (+0000)
Subject: add make variable
X-Git-Tag: v3.4.10.902~736
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3c441a60f117e04a6376f8e947c33e9f1f32641d;p=genkernel.git

add make variable


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

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index d5503a8..94580f7 100755
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -29,6 +29,7 @@ usage() {
   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 "  Internals"
   echo "	--arch-override=<arch>	Force to arch instead of autodetect (cross-compile?)"
   echo "	--busybox-config=<file>	Busybox configuration file to use"
@@ -76,6 +77,10 @@ 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"
+			;;
 			
 			--debuglevel*)
 				CMD_DEBUGLEVEL=`parse_opt "${x}"`
diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index 42df258..a11bdbc 100644
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -28,6 +28,16 @@ determine_real_args() {
 
 	get_KV
 
+	if [ "${CMD_MAKE}" != "" ]
+	then
+		MAKE="${CMD_MAKE}"
+	fi
+
+	if [ "${MAKE}" = "" ]
+	then
+		MAKE="make"
+	fi
+
 	if [ "${CMD_KERNEL_CC}" != "" ]
 	then
 		KERNEL_CC="${CMD_KERNEL_CC}"
diff --git a/x86/config.sh b/x86/config.sh
index b804321..b29ebf3 100644
--- a/x86/config.sh
+++ b/x86/config.sh
@@ -9,6 +9,8 @@ KERNEL_BINARY="arch/i386/boot/bzImage"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
+MAKE=make
+
 KERNEL_CC=gcc
 KERNEL_AS=as
 KERNEL_LD=ld
diff --git a/x86_64/config.sh b/x86_64/config.sh
index 59e7e85..df2af7a 100644
--- a/x86_64/config.sh
+++ b/x86_64/config.sh
@@ -2,10 +2,13 @@
 # x86_64/config.sh
 
 KERNEL_MAKE="bzImage"
+KERNEL_MAKE_2=""
 KERNEL_BINARY="arch/x86_64/boot/bzImage"
 
 USE_DIETLIBC=1
 
+MAKE=make
+
 KERNEL_CC=gcc
 KERNEL_AS=as
 KERNEL_LD=ld