Title: [108836] trunk/Tools
- Revision
- 108836
- Author
- [email protected]
- Date
- 2012-02-24 12:36:45 -0800 (Fri, 24 Feb 2012)
Log Message
Use xcrun to find compiler paths for Generate Derived Sources build phase script
<http://webkit.org/b/79512>
Reviewed by Dan Bernstein.
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
(Generate Derived Sources): Use xcrun to find the path to the
compiler since that works on both iOS and OS X.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (108835 => 108836)
--- trunk/Tools/ChangeLog 2012-02-24 20:07:12 UTC (rev 108835)
+++ trunk/Tools/ChangeLog 2012-02-24 20:36:45 UTC (rev 108836)
@@ -1,3 +1,14 @@
+2012-02-24 David Kilzer <[email protected]>
+
+ Use xcrun to find compiler paths for Generate Derived Sources build phase script
+ <http://webkit.org/b/79512>
+
+ Reviewed by Dan Bernstein.
+
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+ (Generate Derived Sources): Use xcrun to find the path to the
+ compiler since that works on both iOS and OS X.
+
2012-02-24 James Robinson <[email protected]>
Create a watchlist for ScrollingCoordinator changes
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (108835 => 108836)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2012-02-24 20:07:12 UTC (rev 108835)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2012-02-24 20:36:45 UTC (rev 108836)
@@ -545,7 +545,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner\"\n\nexport WebKitTestRunner=\"${SRCROOT}\"\nexport WebCoreScripts=\"${WEBCORE_PRIVATE_HEADERS_DIR}\"\n\nif [ ! $CC ]; then\n case $TARGET_GCC_VERSION in\n (GCC_42)\n export CC=\"${DT_TOOLCHAIN_DIR}/usr/bin/gcc-4.2\";;\n (LLVM_GCC_42)\n export CC=\"${DT_TOOLCHAIN_DIR}/usr/bin/llvm-gcc-4.2\";;\n (LLVM_COMPILER)\n export CC=\"${DT_TOOLCHAIN_DIR}/usr/bin/clang\";;\n esac\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make -f \"${WebKitTestRunner}/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKitTestRunner\"\n\nexport WebKitTestRunner=\"${SRCROOT}\"\nexport WebCoreScripts=\"${WEBCORE_PRIVATE_HEADERS_DIR}\"\n\nif [ ! $CC ]; then\n case $TARGET_GCC_VERSION in\n (GCC_42)\n export CC=\"`xcrun -find gcc-4.2`\";;\n (LLVM_GCC_42)\n export CC=\"`xcrun -find llvm-gcc-4.2`\";;\n (LLVM_COMPILER)\n export CC=\"`xcrun -find clang`\";;\n esac\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make -f \"${WebKitTestRunner}/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
