Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduced a sanity check for building hybrids. This will cause jam to error

Browse Source 
when the user attempts to build an incorrectly configured hybrid.
For example a GCC 2  + GCC 2 system.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38949 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-10-11 17:51:44 +00:00
parent 5f86ad125d
commit b0ce12a2af
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/jam/AlternativeGCCArchive
View File

@ -2,6 +2,12 @@
# the rules building the archive. Included by HaikuImage. # the rules building the archive. Included by HaikuImage.
#sanity check - make sure the primary gcc is different than the alternative gcc
if $(HAIKU_PRIMARY_GCC) = $(HAIKU_GCC_VERSION[1]) {
Exit "Error: Your alternative gcc is the same as the main gcc!"
"You need to reconfigure your generated directories." ;
}
#pragma mark - Build The Archive #pragma mark - Build The Archive

1
build/jam/HaikuImage
View File

@ -670,6 +670,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
cd $(DIRECTORY) cd $(DIRECTORY)
export HAIKU_IGNORE_USER_BUILD_CONFIG=1 export HAIKU_IGNORE_USER_BUILD_CONFIG=1
export HAIKU_ADD_OPTIONAL_PACKAGES=$(OPTIONAL_PACKAGES) export HAIKU_ADD_OPTIONAL_PACKAGES=$(OPTIONAL_PACKAGES)
export HAIKU_PRIMARY_GCC=$(HAIKU_GCC_VERSION[1])
$(JAM:E=jam) -q $(COMMAND_LINE) ; $(JAM:E=jam) -q $(COMMAND_LINE) ;
} }