[haiku-commits] r38949 - haiku/trunk/build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Mon, 11 Oct 2010 19:51:44 +0200 (CEST)

Author: mmadia
Date: 2010-10-11 19:51:44 +0200 (Mon, 11 Oct 2010)
New Revision: 38949
Changeset: http://dev.haiku-os.org/changeset/38949

Modified:
   haiku/trunk/build/jam/AlternativeGCCArchive
   haiku/trunk/build/jam/HaikuImage
Log:
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.


Modified: haiku/trunk/build/jam/AlternativeGCCArchive
===================================================================
--- haiku/trunk/build/jam/AlternativeGCCArchive 2010-10-11 13:39:37 UTC (rev 
38948)
+++ haiku/trunk/build/jam/AlternativeGCCArchive 2010-10-11 17:51:44 UTC (rev 
38949)
@@ -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
 
 

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage    2010-10-11 13:39:37 UTC (rev 38948)
+++ haiku/trunk/build/jam/HaikuImage    2010-10-11 17:51:44 UTC (rev 38949)
@@ -670,6 +670,7 @@
                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) ;
        }
 


Other related posts:

  • » [haiku-commits] r38949 - haiku/trunk/build/jam - mattmadia