about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--mach/Machrules3
-rw-r--r--mach/Makefile3
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3957777fe2..c76f1e0502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-02  Roland McGrath  <roland@frob.com>
+
+	* 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>.
+
 2001-12-01  Roland McGrath  <roland@frob.com>
 
 	* sysdeps/mach/hurd/configure.in (libc_cv_gcc_unwind_find_fde): Add
diff --git a/mach/Machrules b/mach/Machrules
index 90a7fcbae5..c575862d83 100644
--- a/mach/Machrules
+++ b/mach/Machrules
@@ -135,7 +135,8 @@ $(patsubst %,$(objpfx)%.udeps,$(user-interfaces)):
   $(objpfx)%.udeps: $(..)mach/Machrules
 	$(make-target-directory)
 	$(include-%.defs) | \
-	$(CC) $(CPPFLAGS) -M -x c - | \
+# We must use $(CFLAGS) to get -O flags that affect #if's in header files.
+	$(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 7e32034bc4..444c2ed144 100644
--- a/mach/Makefile
+++ b/mach/Makefile
@@ -72,7 +72,8 @@ $(objpfx)mach-syscalls.mk: syscalls.awk Makefile
 	$(make-target-directory)
 	echo '#include <mach/syscall_sw.h>' | \
 	DEPENDENCIES_OUTPUT='$@-dep $@' \
-	$(CC) $(CPPFLAGS) -E -x c-header - \
+# We must use $(CFLAGS) to get -O flags that affect #if's in header files.
+	$(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