From 2ef5f5e05efa3ab29a207b6641b0ac6afefd3f0b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sun, 22 Jan 2023 16:15:55 +0000 Subject: [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 --- src/Makefile.housekeeping | 4 ++++ src/arch/x86/Makefile | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 658b84b6b..f3258025d 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 011260cac..ef801365e 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 -- cgit