Title: [99805] trunk/Tools
- Revision
- 99805
- Author
- [email protected]
- Date
- 2011-11-09 20:17:53 -0800 (Wed, 09 Nov 2011)
Log Message
[wx] Unreviewed build fix. Support XCode 4 when building deps.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (99804 => 99805)
--- trunk/Tools/ChangeLog 2011-11-10 04:13:00 UTC (rev 99804)
+++ trunk/Tools/ChangeLog 2011-11-10 04:17:53 UTC (rev 99805)
@@ -1,3 +1,9 @@
+2011-11-09 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix. Support XCode 4 when building deps.
+
+ * wx/install-unix-extras:
+
2011-11-09 Eric Seidel <[email protected]>
Remove the concept of platform-dependent unittests
Modified: trunk/Tools/wx/install-unix-extras (99804 => 99805)
--- trunk/Tools/wx/install-unix-extras 2011-11-10 04:13:00 UTC (rev 99804)
+++ trunk/Tools/wx/install-unix-extras 2011-11-10 04:17:53 UTC (rev 99805)
@@ -84,16 +84,22 @@
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"
if [ ! -d $SDK ]; then
SDK="/Developer/SDKs/MacOSX10.5.sdk"
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
cd $DL_DIR
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
