hrev50685 adds 2 changesets to branch 'master'
old head: f4ff9cb02c1d292908407314ed023af25e0995da
new head: 25fa3b1b8aabf9ad11b1487a3ce5317e4c857a4a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=25fa3b1b8aab+%5Ef4ff9cb02c1d
----------------------------------------------------------------------------
04f0d02a8f5a: Jamfiles: fix TARGET_BOOT_PLATFORM tests to use = efi
25fa3b1b8aab: loader: fix defines affecting elf.cpp for other platforms
[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 8 insertions(+), 8 deletions(-)
src/system/boot/Jamfile | 2 +-
src/system/boot/arch/x86/Jamfile | 4 ++--
src/system/boot/loader/Jamfile | 10 +++++-----
############################################################################
Commit: 04f0d02a8f5aa3558fcc236d7676f99764382214
URL: http://cgit.haiku-os.org/haiku/commit/?id=04f0d02a8f5a
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Mon Nov 14 10:45:22 2016 UTC
Jamfiles: fix TARGET_BOOT_PLATFORM tests to use = efi
----------------------------------------------------------------------------
diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index 6e98fe4..d005d35 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -4,7 +4,7 @@ SetupFeatureObjectsDir $(TARGET_BOOT_PLATFORM) ;
DEFINES += _BOOT_MODE ;
-if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) != bios_ia32 {
+if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) libroot os arch
x86_64 ] ;
} else {
diff --git a/src/system/boot/arch/x86/Jamfile b/src/system/boot/arch/x86/Jamfile
index b1ca213..4b68735 100644
--- a/src/system/boot/arch/x86/Jamfile
+++ b/src/system/boot/arch/x86/Jamfile
@@ -10,7 +10,7 @@ local kernelArchSources =
local kernelArchSpecificSources ;
local kernelLibArchSpecificSources ;
-if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) != bios_ia32 {
+if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
kernelArchSpecificSources = cpuid.cpp ;
kernelLibArchSpecificSources = arch_string.cpp ;
} else {
@@ -33,7 +33,7 @@ BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
SEARCH on [ FGristFiles $(kernelArchSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch x86 ] ;
-if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) != bios_ia32 {
+if $(TARGET_ARCH) = x86_64 && $(TARGET_BOOT_PLATFORM) = efi {
SEARCH on [ FGristFiles $(kernelArchSpecificSources) ]
= [ FDirName $(HAIKU_TOP) src system kernel arch x86 64 ] ;
SEARCH on [ FGristFiles $(kernelLibArchSpecificSources) ]
############################################################################
Revision: hrev50685
Commit: 25fa3b1b8aabf9ad11b1487a3ce5317e4c857a4a
URL: http://cgit.haiku-os.org/haiku/commit/?id=25fa3b1b8aab
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Mon Nov 14 10:46:10 2016 UTC
loader: fix defines affecting elf.cpp for other platforms
----------------------------------------------------------------------------
diff --git a/src/system/boot/loader/Jamfile b/src/system/boot/loader/Jamfile
index d566b68..b76f854 100644
--- a/src/system/boot/loader/Jamfile
+++ b/src/system/boot/loader/Jamfile
@@ -47,11 +47,7 @@ UsePrivateHeaders shared storage ;
#BOOT_SUPPORT_FILE_SYSTEM_FAT
;
- if $(HAIKU_BOOT_PLATFORM) != efi {
- DEFINES +=
- BOOT_SUPPORT_ELF32
- ;
- } else {
+ if $(HAIKU_BOOT_PLATFORM) = efi {
DEFINES +=
_BOOT_PLATFORM_EFI
;
@@ -59,6 +55,10 @@ UsePrivateHeaders shared storage ;
}
}
+ if $(HAIKU_BOOT_PLATFORM) != efi {
+ DEFINES += BOOT_SUPPORT_ELF32 ;
+ }
+
local kernelC++Header = [ FDirName $(HAIKU_TOP) headers private kernel
util
kernel_cpp.h ] ;
