From e986f5fce9db69ffe69ed046a6fd02bdb54f2c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 11 Oct 2013 23:30:57 +0200 Subject: [PATCH] Enable stripping binaries in m68k boot floppy This makes it fit again. We can't reference in BuildSetup a variable set with the other ones in KernelArchitectureSetup since the rule is invoked later. --- build/jam/ArchitectureRules | 3 +++ build/jam/BuildSetup | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index 7e90f66154..affdf927cd 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -318,6 +318,9 @@ rule KernelArchitectureSetup architecture } # offset in floppy image (>= sizeof(haiku_loader)) HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 260 ; # in kB + # the image is too small to have unstripped binaries + HAIKU_CONTAINER_STRIP_BINARIES on + $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) = 1 ; case mipsel : # RouterBOARD firmware (ELF image over TFTP) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index c1ec3b3bc0..f07fb103a8 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -46,8 +46,6 @@ HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) = HAIKU_FLOPPY_BOOT_IMAGE_INSTALL_TARGETS ; HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) = system ; -#HAIKU_CONTAINER_STRIP_BINARIES on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME) -# = 1 ; # boot CD image HAIKU_CD_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-cd-container ;