[haiku-commits] BRANCH tqh-github.efi [734235c] build/jam

  • From: tqh-github.efi <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 7 Sep 2013 13:00:33 +0200 (CEST)

added 1 changeset to branch 'refs/remotes/tqh-github/efi'
old head: 7c7b6b749249939e29747d79e63bd01f30426262
new head: 734235c8e9d7ff53970372f1cb0109a0a498061a
overview: https://github.com/tqh/haiku/compare/7c7b6b7...734235c

----------------------------------------------------------------------------

734235c: Set bios_ia32 only if no other boot platform is set.
  
  Only set bios_ia32 flags for x86_64 if boot platform is bios_ia32.

                         [ Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx> ]

----------------------------------------------------------------------------

Commit:      734235c8e9d7ff53970372f1cb0109a0a498061a
Author:      Fredrik Holmqvist <fredrik.holmqvist@xxxxxxxxx>
Date:        Sat Sep  7 10:46:12 2013 UTC

----------------------------------------------------------------------------

1 file changed, 8 insertions(+), 6 deletions(-)
build/jam/BuildSetup | 14 ++++++++------

----------------------------------------------------------------------------

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 47f346f..057d528 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -254,7 +254,7 @@ switch $(HAIKU_CPU) {
        case x86 :
        {
                HAIKU_DEFINES += __INTEL__ ;
-               HAIKU_BOOT_PLATFORM = bios_ia32 ;
+               HAIKU_BOOT_PLATFORM ?= bios_ia32 ;
                HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
                # offset in floppy image (>= sizeof(haiku_loader))
                HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
@@ -267,7 +267,7 @@ switch $(HAIKU_CPU) {
        case x86_64 :
        {
                # x86_64 completely shares the x86 bootloader.
-               HAIKU_BOOT_PLATFORM = bios_ia32 ;
+               HAIKU_BOOT_PLATFORM ?= bios_ia32 ;
                HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
                # offset in floppy image (>= sizeof(haiku_loader))
                HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
@@ -419,10 +419,12 @@ switch $(HAIKU_ARCH) {
                HAIKU_KERNEL_PIC_LINKFLAGS += -z max-page-size=0x1000 ;
                HAIKU_KERNEL_ADDON_LINKFLAGS += -z max-page-size=0x1000 ;
 
-               # Bootloader is 32-bit.
-               HAIKU_BOOT_LINKFLAGS += -m elf_i386_haiku ;
-               HAIKU_BOOT_CCFLAGS += -m32 -march=pentium ;
-               HAIKU_BOOT_C++FLAGS += -m32 -march=pentium ;
+               if $HAIKU_BOOT_PLATFORM = bios_ia32 {
+                       # Bootloader is 32-bit.
+                       HAIKU_BOOT_LINKFLAGS += -m elf_i386_haiku ;
+                       HAIKU_BOOT_CCFLAGS += -m32 -march=pentium ;
+                       HAIKU_BOOT_C++FLAGS += -m32 -march=pentium ;
+               }
 
                # Enable use of the gcc built-in atomic functions instead of 
atomic_*().
                # The former are inlined and have thus less overhead.


Other related posts: