aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2023-01-22 16:15:55 +0000
committerMichael Brown <mcb30@ipxe.org>2023-01-22 16:19:22 +0000
commit2ef5f5e05efa3ab29a207b6641b0ac6afefd3f0b (patch)
tree8c1e014cd11b0d4d4eb96b4fd7ce18c211a27d80
parent475c0dfa8e5b841ff29d3fbf7d6828e3cdd05ad5 (diff)
downloadipxe-2ef5f5e05efa3ab29a207b6641b0ac6afefd3f0b.zip
ipxe-2ef5f5e05efa3ab29a207b6641b0ac6afefd3f0b.tar.gz
ipxe-2ef5f5e05efa3ab29a207b6641b0ac6afefd3f0b.tar.bz2
[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>
-rw-r--r--src/Makefile.housekeeping4
-rw-r--r--src/arch/x86/Makefile3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 658b84b..f325802 100644
--- 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 011260c..ef80136 100644
--- 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