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

BuildConfig needs to be included before any other rules file. That's why

Browse Source 
the wrong Link actions were used (always the no-attributes-support ones
which remove the target first), for instance.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28304 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2008-10-23 21:45:24 +00:00
parent bdb1d3ac7c
commit 889903f9dd
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+9
View File
@@ -14,6 +14,15 @@ HCACHEFILE = header_cache ;
JCACHEFILE = jamfile_cache ; JCACHEFILE = jamfile_cache ;
LOCATE on $(HCACHEFILE) $(JCACHEFILE) = $(HAIKU_BUILD_OUTPUT_DIR) ; LOCATE on $(HCACHEFILE) $(JCACHEFILE) = $(HAIKU_BUILD_OUTPUT_DIR) ;
# include BuildConfig
local buildConfig = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : BuildConfig ] ;
if ! $(buildConfig) {
ECHO "No `BuildConfig' found in $(HAIKU_BUILD_OUTPUT_DIR)!" ;
EXIT "Run ./configure in the source tree's root directory first!" ;
}
LOCATE on BuildConfig = $(HAIKU_BUILD_OUTPUT_DIR) ;
include BuildConfig ;
# The build setup and rules are neatly organized in several files. Include # The build setup and rules are neatly organized in several files. Include
# them now. Start with the side-effect-less rules, since they are the most # them now. Start with the side-effect-less rules, since they are the most
# likely to be used in the top level context (i.e. not only in rules). # likely to be used in the top level context (i.e. not only in rules).
build/jam/BuildSetup
+1 -8
View File
@@ -106,16 +106,11 @@ if $(JAM_TARGETS) {
} }
# Include BuildConfig/Timezones/libgccObjects # include Timezones/libgccObjects
{ {
local buildConfig = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : BuildConfig ] ;
local timezones = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : Timezones ] ; local timezones = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : Timezones ] ;
local libgccObjects = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : libgccObjects ] ; local libgccObjects = [ GLOB $(HAIKU_BUILD_OUTPUT_DIR) : libgccObjects ] ;
if ! $(buildConfig) {
ECHO "No `BuildConfig' found in $(HAIKU_BUILD_OUTPUT_DIR)!" ;
EXIT "Run ./configure in the source tree's root directory first!" ;
}
if ! ( $(timezones) && $(libgccObjects) ) { if ! ( $(timezones) && $(libgccObjects) ) {
ECHO "No `Timezones' or `libgccObjects' found in" ECHO "No `Timezones' or `libgccObjects' found in"
"$(HAIKU_BUILD_OUTPUT_DIR)!" ; "$(HAIKU_BUILD_OUTPUT_DIR)!" ;
@@ -123,11 +118,9 @@ if $(JAM_TARGETS) {
"again!" ; "again!" ;
} }
LOCATE on BuildConfig = $(HAIKU_BUILD_OUTPUT_DIR) ;
LOCATE on Timezones = $(HAIKU_BUILD_OUTPUT_DIR) ; LOCATE on Timezones = $(HAIKU_BUILD_OUTPUT_DIR) ;
LOCATE on libgccObjects = $(HAIKU_BUILD_OUTPUT_DIR) ; LOCATE on libgccObjects = $(HAIKU_BUILD_OUTPUT_DIR) ;
include BuildConfig ;
include Timezones ; include Timezones ;
include libgccObjects ; include libgccObjects ;
} }