[build] Move -Ulinux to common Makefile

The requirement to undo the implicit "-Dlinux" is not specific to the
x86 architecture.  Move this out of the x86-specific Makefile.

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 658b84b6bd422c335ad8e23e36b3c824f0053169..f3258025de79980b45cb89227c28616a7a5c4e96 100644 (file)
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -512,6 +512,10 @@ CFLAGS             += -include include/compiler.h
 #
 CFLAGS         += -DASM_TCHAR='$(ASM_TCHAR)' -DASM_TCHAR_OPS='$(ASM_TCHAR_OPS)'
 
+# Inhibit the default -Dlinux
+#
+CFLAGS         += -Ulinux
+
 # CFLAGS for specific object types
 #
 CFLAGS_c       +=

diff --git a/src/arch/x86/Makefile b/src/arch/x86/Makefile
index 011260cac7fc9abf773e1e4e0fa7b1565a3026e7..ef801365e531f6b93ad8eafab4031d8a10ba1963 100644 (file)
--- a/src/arch/x86/Makefile
+++ b/src/arch/x86/Makefile
@@ -22,9 +22,6 @@ SRCDIRS               += arch/x86/drivers/xen
 SRCDIRS                += arch/x86/drivers/hyperv
 SRCDIRS                += arch/x86/transitions
 
-# breaks building some of the linux-related objects
-CFLAGS         += -Ulinux
-
 # disable valgrind
 CFLAGS         += -DNVALGRIND