diff --git a/build/jam/AlternativeGCCArchive b/build/jam/AlternativeGCCArchive index f0ed063d0a..5a7827f131 100644 --- a/build/jam/AlternativeGCCArchive +++ b/build/jam/AlternativeGCCArchive @@ -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 diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 26e9d74039..fbb4fb7779 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -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) ; }