From 889903f9ddd32ff7a953b3093b6e9bb4ebe2fd65 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Thu, 23 Oct 2008 21:45:24 +0000
Subject: [PATCH] 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
---
 Jamrules             | 9 +++++++++
 build/jam/BuildSetup | 9 +--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Jamrules b/Jamrules
index c7808fc435..f21f9cb1fd 100644
--- a/Jamrules
+++ b/Jamrules
@@ -14,6 +14,15 @@ HCACHEFILE = header_cache ;
 JCACHEFILE = jamfile_cache ;
 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
 # 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).
diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 501bd6686e..4623c2d304 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -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 ;
 }