Changeset 99805 in webkit

Timestamp:

Nov 9, 2011, 8:17:53 PM (15 years ago)

Author:

kevino@webkit.org

Message:

[wx] Unreviewed build fix. Support XCode 4 when building deps.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• wx/install-unix-extras (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-09  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Support XCode 4 when building deps.
+
+        * wx/install-unix-extras:
+
 2011-11-09  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/wx/install-unix-extras

@@ -85 +85 @@
 export MAC_OS_X_DEPLOYMENT_TARGET=10.4
 
-ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
+ARCH_FLAGS="-arch i386 -arch x86_64"
 SDK="/Developer/SDKs/MacOSX10.4u.sdk"
 
@@ -92 +92 @@
 fi
 
+if [ ! -d $SDK ]; then
+    SDK="/Developer/SDKs/MacOSX10.6.sdk"
+fi
+
 if [ "${OSTYPE:0:6}" == "darwin" ]; then  
-    export CC="gcc-4.0"
-    export CXX="g++-4.0"
+    if [ -x /usr/bin/gcc-4.0 ]; then
+        export CC="gcc-4.0"
+        export CXX="g++-4.0"
+    fi
 fi