hrev52243 adds 1 changeset to branch 'master'
old head: 466b81b6c24fc1aa4d519bbef134a834f223de20
new head: 816a311dd7d3306d440e7bc87df79f771dee2750
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=816a311dd7d3+%5E466b81b6c24f
----------------------------------------------------------------------------
816a311dd7d3: build/clang: Use elf_i386 under clang for 32-bit bootloader
Change-Id: If4606e62e94b9d4e393a667d35c09b9471b66653
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52243
Commit: 816a311dd7d3306d440e7bc87df79f771dee2750
URL: https://git.haiku-os.org/haiku/commit/?id=816a311dd7d3
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Fri Aug 17 15:08:30 2018 UTC
----------------------------------------------------------------------------
1 file changed, 5 insertions(+), 1 deletion(-)
build/jam/ArchitectureRules | 6 +++++-
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 7df58798d5..2a0274c8f1 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -393,7 +393,11 @@ rule KernelArchitectureSetup architecture
# BIOS Bootloader is 32-bit.
if $(HAIKU_BOOT_PLATFORM) = bios_ia32 {
- HAIKU_BOOT_LINKFLAGS += -m elf_i386_haiku ;
+ if $(HAIKU_CC_IS_CLANG_$(architecture)) = 1 {
+ HAIKU_BOOT_LINKFLAGS += -m elf_i386 ;
+ } else {
+ HAIKU_BOOT_LINKFLAGS += -m
elf_i386_haiku ;
+ }
HAIKU_BOOT_CCFLAGS += -m32 -march=pentium ;
HAIKU_BOOT_C++FLAGS += -m32 -march=pentium ;
}
