[haiku-commits] haiku: hrev47346 - build/jam

From: zooey@xxxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Wed, 11 Jun 2014 09:44:25 +0200 (CEST)
hrev47346 adds 1 changeset to branch 'master'
old head: bc4db40c4033d294d3f1f740f4d9afa3fac5fdc9
new head: 006637a9b64592ff3fa679f497e064e0aa99e9bd
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=006637a+%5Ebc4db40

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

006637a: Revert "Increase HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET for debug builds."
  
  * That change did not make any sense, as the floppy-boot images
    can't be built in debug mode anyway (the result is much too large).
  
  This reverts commit 911821275aa1ab1f7b030050a9878b69de15beec.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

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

Revision:    hrev47346
Commit:      006637a9b64592ff3fa679f497e064e0aa99e9bd
URL:         http://cgit.haiku-os.org/haiku/commit/?id=006637a
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sun Jun  8 09:54:17 2014 UTC

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

1 file changed, 2 insertions(+), 13 deletions(-)
build/jam/ArchitectureRules | 15 ++-------------

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

diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index bf5d223..0c3200f 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -275,9 +275,6 @@ rule KernelArchitectureSetup architecture
        local gccVersion = $(HAIKU_GCC_VERSION_$(architecture)) ;
        local cpu = $(HAIKU_CPU_$(architecture)) ;
 
-       local debugBootLoader
-               = [ ConfigVar DEBUG : HAIKU_TOP src system boot loader ] ;
-
        switch $(cpu) {
                case ppc :
                        HAIKU_BOOT_PLATFORM ?= openfirmware ;
@@ -326,11 +323,7 @@ rule KernelArchitectureSetup architecture
                        HAIKU_BOOT_PLATFORM = bios_ia32 ;
                        HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
                        # offset in floppy image (>= sizeof(haiku_loader))
-                       if $(debugBootLoader) {
-                               HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 350 ; # in kB
-                       } else {
-                               HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
-                       }
+                       HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
 
                        # nasm is required for target arch x86
                        if ! $(HAIKU_NASM) {
@@ -342,11 +335,7 @@ rule KernelArchitectureSetup architecture
                        HAIKU_BOOT_PLATFORM = bios_ia32 ;
                        HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
                        # offset in floppy image (>= sizeof(haiku_loader))
-                       if $(debugBootLoader) {
-                               HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 350 ; # in kB
-                       } else {
-                               HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
-                       }
+                       HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
 
                        # x86_64 kernel source is under arch/x86.
                        HAIKU_KERNEL_ARCH = x86 ;
[haiku-commits] haiku: hrev47346 - build/jam

Other related posts:
