i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include BoardSetup from BuildSetup

Browse Source 
* while it seemed to work before, BuildSetup was actually adding includes from the default boot platform, before BoardSetup had a chance of changing it.
This commit is contained in:
François Revol
2012-05-11 17:53:30 +02:00
parent d1645229d1
commit 3884764492
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
-7
View File
@@ -88,11 +88,4 @@ if $(HAIKU_BUILD_PROFILE) && ! $(HAIKU_BUILD_PROFILE_DEFINED) {
} }
} }
# Include embedded board-specific file.
# UserBuildConfig can override HAIKU_BOOT_BOARD.
if $(HAIKU_BOOT_BOARD) {
include [ FDirName $(HAIKU_BUILD_RULES_DIR) board $(HAIKU_BOOT_BOARD)
BoardSetup ] ;
}
PrepareConfigVariables ; PrepareConfigVariables ;
build/jam/BuildSetup
+7
View File
@@ -293,6 +293,13 @@ switch $(HAIKU_CPU) {
case * : case * :
Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ; Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ;
} }
# Include embedded board-specific file.
if $(HAIKU_BOOT_BOARD) {
include [ FDirName $(HAIKU_BUILD_RULES_DIR) board $(HAIKU_BOOT_BOARD)
BoardSetup ] ;
}
HAIKU_ARCH ?= $(HAIKU_CPU) ; HAIKU_ARCH ?= $(HAIKU_CPU) ;
HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ; HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ;
HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ;