Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.)
This commit is contained in:
Augustin Cavalier 2018-11-22 13:16:32 -05:00
parent 58b7901304
commit df34a27137
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/jam/BootRules
View File

@ -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) ;

4
build/jam/KernelRules
View File

@ -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) ;