BuildConfig needs to be included before any other rules file. That's why
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:
@@ -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 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) ) {
|
||||
ECHO "No `Timezones' or `libgccObjects' found in"
|
||||
"$(HAIKU_BUILD_OUTPUT_DIR)!" ;
|
||||
@@ -123,11 +118,9 @@ if $(JAM_TARGETS) {
|
||||
"again!" ;
|
||||
}
|
||||
|
||||
LOCATE on BuildConfig = $(HAIKU_BUILD_OUTPUT_DIR) ;
|
||||
LOCATE on Timezones = $(HAIKU_BUILD_OUTPUT_DIR) ;
|
||||
LOCATE on libgccObjects = $(HAIKU_BUILD_OUTPUT_DIR) ;
|
||||
|
||||
include BuildConfig ;
|
||||
include Timezones ;
|
||||
include libgccObjects ;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user