Introduced a sanity check for building hybrids. This will cause jam to error
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:
parent
5f86ad125d
commit
b0ce12a2af
@ -2,6 +2,12 @@
|
||||
# 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
|
||||
|
||||
|
||||
|
@ -670,6 +670,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) = 1
|
||||
cd $(DIRECTORY)
|
||||
export HAIKU_IGNORE_USER_BUILD_CONFIG=1
|
||||
export HAIKU_ADD_OPTIONAL_PACKAGES=$(OPTIONAL_PACKAGES)
|
||||
export HAIKU_PRIMARY_GCC=$(HAIKU_GCC_VERSION[1])
|
||||
$(JAM:E=jam) -q $(COMMAND_LINE) ;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user