From: Tomas Hruby <tom@minix3.org>
Date: Wed, 1 Sep 2010 07:46:51 +0000 (+0000)
Subject: tools/Makefile uses padtext only when building with ack
X-Git-Tag: v3.1.8~28
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=bf6f0216d56beeb554d8426bab0ed55bbbbf267e;p=minix.git

tools/Makefile uses padtext only when building with ack
---

diff --git a/tools/Makefile b/tools/Makefile
index 982bdc441..9e58e5b9a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -42,14 +42,23 @@ usage:
 
 all: services image
 
+# Pad the kernel text only if ACK compiler is used. padtext does not work for
+# gnu-like compilers as they generate common I&D and a linker script can do the
+# same in a nicer way
+.if ${COMPILER_TYPE} == "gnu"
+PAD_KERNEL_TEXT := cp ../kernel/kernel kernel
+.else
+PAD_KERNEL_TEXT := padtext ../kernel/kernel kernel
+.endif
+
 # for fast complie kernel and generate image, skip servers and drivers
 image_mb: includes
 	cd ../kernel && $(MAKE)
-	padtext ../kernel/kernel kernel
+	${PAD_KERNEL_TEXT}
 	installboot -image $@ $(PROGRAMS)
 	
 image:  includes services
-	padtext ../kernel/kernel kernel
+	${PAD_KERNEL_TEXT}
 	installboot -image $@ $(PROGRAMS)
 
 # rebuild the program or system libraries