[haiku-commits] haiku: hrev46431 - build/jam

  • From: kallisti5@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 24 Nov 2013 21:07:45 +0100 (CET)

hrev46431 adds 1 changeset to branch 'master'
old head: 62d2f838eb215dbb202daff723c6be49af2096fb
new head: f3c471f44cc64ccc015053acdd8afb0e1fb55d71
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=f3c471f+%5E62d2f83

----------------------------------------------------------------------------

f3c471f: build: Only build WebPositive on x86, x86_gcc2
  
  * Should fix the non-x86 builds

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46431
Commit:      f3c471f44cc64ccc015053acdd8afb0e1fb55d71
URL:         http://cgit.haiku-os.org/haiku/commit/?id=f3c471f
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Sun Nov 24 20:06:54 2013 UTC

----------------------------------------------------------------------------

1 file changed, 8 insertions(+), 4 deletions(-)
build/jam/DefaultBuildProfiles | 12 ++++++++----

----------------------------------------------------------------------------

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 650808a..7896f70 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -66,9 +66,11 @@ rule DefineDefaultBuildProfiles
 
                        AddOptionalHaikuImagePackages BeBook Development Git 
Welcome ;
 
-                       # Temporary until WebPositive is fixed on x86_64
-            if $(HAIKU_PACKAGING_ARCHS) != x86_64 {
+                       # WebPositive is only built for x86 and x86_gcc2 at the 
moment
+                       if $(HAIKU_PACKAGING_ARCHS) in x86_gcc2 x86 {
                                AddOptionalHaikuImagePackages WebPositive ;
+                       } else {
+                               Echo "WebPositive not available on 
$(HAIKU_PACKAGING_ARCHS)" ;
                        }
                }
 
@@ -101,9 +103,11 @@ rule DefineDefaultBuildProfiles
 
                        AddOptionalHaikuImagePackages Development Git ;
 
-                       # Temporary until WebPositive is fixed on x86_64
-            if $(HAIKU_PACKAGING_ARCHS) != x86_64 {
+                       # WebPositive is only built for x86 and x86_gcc2 at the 
moment
+                       if $(HAIKU_PACKAGING_ARCHS) in x86_gcc2 x86 {
                                AddOptionalHaikuImagePackages WebPositive ;
+                       } else {
+                               Echo "WebPositive not available on 
$(HAIKU_PACKAGING_ARCHS)" ;
                        }
                }
 


Other related posts: