Title: [108826] trunk/Source/WebCore
- Revision
- 108826
- Author
- [email protected]
- Date
- 2012-02-24 11:22:11 -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 Mark Rowe.
* WebCore.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/Source/WebCore/ChangeLog (108825 => 108826)
--- trunk/Source/WebCore/ChangeLog 2012-02-24 19:06:34 UTC (rev 108825)
+++ trunk/Source/WebCore/ChangeLog 2012-02-24 19:22:11 UTC (rev 108826)
@@ -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 Mark Rowe.
+
+ * WebCore.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 Anders Carlsson <[email protected]>
Crash in TileCache::revalidateTiles
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (108825 => 108826)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-24 19:06:34 UTC (rev 108825)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-24 19:22:11 UTC (rev 108826)
@@ -24680,7 +24680,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\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 --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\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 --no-builtin-rules -f \"WebCore/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
