From df34a27137b927c9f7cd25be1bda68d6a086a9f6 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 22 Nov 2018 13:16:32 -0500 Subject: [PATCH] build: Do not use regular TARGET_*FLAGS in kernel and bootloader. The generic CCFLAGS are already appended to the HAIKU_KERNEL_*FLAGS and HAIKU_BOOT_*FLAGS, so these were just duplicates. And now that we strip certain flags out of the base ones, this was incorrect (and causes Clang to error in some circumstances.) --- build/jam/BootRules | 4 ++++ build/jam/KernelRules | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/build/jam/BootRules b/build/jam/BootRules index 404efdb8ca..2e18934804 100644 --- a/build/jam/BootRules +++ b/build/jam/BootRules @@ -96,6 +96,10 @@ rule SetupBoot ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ; ASFLAGS on $(object) = $(HAIKU_BOOT_CCFLAGS) $(HAIKU_BOOT_$(platform)_CCFLAGS) ; + # override regular CCFLAGS/C++FLAGS, as we don't want them + TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ; + TARGET_C++FLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ; + # override warning flags TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = $(TARGET_KERNEL_WARNING_CCFLAGS) ; diff --git a/build/jam/KernelRules b/build/jam/KernelRules index ce110183f4..e1077c25ed 100644 --- a/build/jam/KernelRules +++ b/build/jam/KernelRules @@ -21,6 +21,10 @@ rule SetupKernel ObjectC++Flags $(object) : $(TARGET_KERNEL_C++FLAGS) $(2) ; ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ; + # override regular CCFLAGS/C++FLAGS, as we don't want them + TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ; + TARGET_C++FLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = ; + # override warning flags TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object) = $(TARGET_KERNEL_WARNING_CCFLAGS) ;