hrev52413 adds 1 changeset to branch 'master'
old head: 81b33e381f12cf2dc3e034fc81ba43fc55e12fce
new head: 8522edfe36ad13c3b56b45d60badd2a235b1206a
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=8522edfe36ad+%5E81b33e381f12
----------------------------------------------------------------------------
8522edfe36ad: jam: Ensure common boot LDFLAGS and ASFLAGS get distributed
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52413
Commit: 8522edfe36ad13c3b56b45d60badd2a235b1206a
URL: https://git.haiku-os.org/haiku/commit/?id=8522edfe36ad
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Oct 19 14:02:45 2018 UTC
----------------------------------------------------------------------------
3 files changed, 8 insertions(+), 6 deletions(-)
build/jam/ArchitectureRules | 10 ++++++----
build/jam/BootRules | 2 +-
src/system/boot/Jamfile | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 6972f11d5e..a371c2df01 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -360,15 +360,16 @@ rule KernelArchitectureSetup architecture
HAIKU_KERNEL_CCFLAGS = $(HAIKU_CCFLAGS_$(architecture)) $(ccBaseFlags) ;
HAIKU_KERNEL_C++FLAGS = $(HAIKU_C++FLAGS_$(architecture))
$(c++BaseFlags) ;
+ HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
+ HAIKU_KERNEL_PIC_LINKFLAGS = ;
+ HAIKU_KERNEL_ADDON_LINKFLAGS = ;
+
+ # Common boot-related cflags which apply to all loaders
HAIKU_BOOT_CCFLAGS = $(HAIKU_CCFLAGS_$(architecture)) $(ccBaseFlags) ;
HAIKU_BOOT_C++FLAGS = $(HAIKU_C++FLAGS_$(architecture)) $(c++BaseFlags)
;
HAIKU_BOOT_LINKFLAGS = ;
HAIKU_BOOT_LDFLAGS = -Bstatic ;
- HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
- HAIKU_KERNEL_PIC_LINKFLAGS = ;
- HAIKU_KERNEL_ADDON_LINKFLAGS = ;
-
# Any special kernel base addresses
if $(HAIKU_BOOT_LOADER_BASE) {
HAIKU_BOOT_LDFLAGS +=
@@ -420,6 +421,7 @@ rule KernelArchitectureSetup architecture
}
}
+ # bootloader-centric flags
local bootTarget ;
for bootTarget in $(HAIKU_BOOT_TARGETS) {
switch $(bootTarget) {
diff --git a/build/jam/BootRules b/build/jam/BootRules
index 305ab519be..582e1d0361 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -94,7 +94,7 @@ rule SetupBoot
ObjectCcFlags $(object) : $(HAIKU_BOOT_CCFLAGS)
$(HAIKU_BOOT_$(platform)_CCFLAGS) $(2) ;
ObjectC++Flags $(object) : $(HAIKU_BOOT_C++FLAGS)
$(HAIKU_BOOT_$(platform)_C++FLAGS) $(2) ;
ObjectDefines $(object) : $(TARGET_KERNEL_DEFINES) ;
- ASFLAGS on $(object) = $(HAIKU_BOOT_$(platform)_CCFLAGS) ;
+ ASFLAGS on $(object) = $(HAIKU_BOOT_CCFLAGS)
$(HAIKU_BOOT_$(platform)_CCFLAGS) ;
# override warning flags
TARGET_WARNING_CCFLAGS_$(TARGET_PACKAGING_ARCH) on $(object)
diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index c7ecc5ea85..7a6164963c 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -163,7 +163,7 @@ for platform in [ MultiBootSubDirSetup ] {
local archGrist = [ FGrist src system boot arch
$(TARGET_KERNEL_ARCH) $(platform:G=) ] ;
local archObject = boot_arch_$(TARGET_KERNEL_ARCH).o ;
- local ldflags = $(HAIKU_BOOT_$(platform:G=:U)_LDFLAGS) ;
+ local ldflags = $(HAIKU_BOOT_LDFLAGS)
$(HAIKU_BOOT_$(platform:G=:U)_LDFLAGS) ;
ldflags ?= $(TARGET_BOOT_LDFLAGS) ;
# efi loader needs to be shared.
