From: Roland McGrath <roland@gnu.org>
Date: Wed, 9 Jan 2002 04:16:57 +0000 (+0000)
Subject: 2001-12-02  Roland McGrath  <roland@frob.com>
X-Git-Tag: cvs/glibc-2-2-5~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cff42af517c72585f112a9d02b4f4e12c4d15939;p=thirdparty%2Fglibc.git

2001-12-02  Roland McGrath  <roland@frob.com>

	* mach/Makefile, mach/Machrules: Move comments out of \ continuations.
	* mach/Makefile ($(objpfx)mach-syscalls.mk): Pass $(CFLAGS) to $(CC).
	* mach/Machrules ($(objpfx)%.udeps static pattern rule): Likewise.
	Reported by Jeff Bailey <jbailey@nisa.net>.
---

diff --git a/mach/Machrules b/mach/Machrules
index 90a7fcbae5a..6e873972213 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -56,7 +56,7 @@ MIGFLAGS = -DMACH_IPC_COMPAT=0 -DSTANDALONE -DTypeCheck=0 \
 	   $(+includes) $(migdefines) -subrprefix __
 # Putting CC in the enivronment makes the mig wrapper script
 # use the same compiler setup we are using to run cpp.
-MIG := CC='${CC}' $(MIG)
+MIG := CC='${CC}' CPP='${CPP}' $(MIG)
 
 .SUFFIXES: .defs	# Just to set specified_rule_matched.
 
@@ -134,8 +134,9 @@ $(patsubst %,$(objpfx)%.ustamp,$(user-interfaces)): $(objpfx)%.ustamp:
 $(patsubst %,$(objpfx)%.udeps,$(user-interfaces)):
   $(objpfx)%.udeps: $(..)mach/Machrules
 	$(make-target-directory)
+# We must use $(CFLAGS) to get -O flags that affect #if's in header files.
 	$(include-%.defs) | \
-	$(CC) $(CPPFLAGS) -M -x c - | \
+	$(CC) $(CFLAGS) $(CPPFLAGS) -M -x c - | \
 	sed -e 's,- *:,$@ $(@:.udeps=.ustamp) $(@:.udeps=.uh) $(@:.udeps=.__h)\
 			  $(@:.udeps=_server.c) $(@:.udeps=_server.h):,' \
 	    $(sed-remove-objpfx) > $@.new
diff --git a/mach/Makefile b/mach/Makefile
index 7e32034bc42..ef6a6105d63 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -70,9 +70,10 @@ endif
 $(objpfx)mach-syscalls.mk: syscalls.awk Makefile
 # Go kludges!!!
 	$(make-target-directory)
+# We must use $(CFLAGS) to get -O flags that affect #if's in header files.
 	echo '#include <mach/syscall_sw.h>' | \
 	DEPENDENCIES_OUTPUT='$@-dep $@' \
-	$(CC) $(CPPFLAGS) -E -x c-header - \
+	$(CC) $(CFLAGS) $(CPPFLAGS) -E -x c-header - \
 	      -D_MACH_`echo $(base-machine) | tr a-z A-Z`_SYSCALL_SW_H_=1 | \
 	sed -n -e 's/^kernel_trap(\(.*\),\([-0-9]*\),\([0-9]*\))$$/\1 \2 \3/p'\
 	| $(AWK) -f $< > $@-new