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 90a7fcbae5a7816e0ca02bb9d612d1f1207855e5..6e873972213341d0762ca5468d3a1f48c0c18f60 100644 (file)
--- 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 7e32034bc427ccb78ea234fb6ac9127cf618b08a..ef6a6105d63924f3d3b8548e5b3412a7a2a42660 100644 (file)
--- 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