Title: [114169] trunk/Source/WebKit2
- Revision
- 114169
- Author
- ander...@apple.com
- Date
- 2012-04-13 14:29:54 -0700 (Fri, 13 Apr 2012)
Log Message
Make sure that we're using the right compiler for generating derived sources.
Rubber-stamped by Dan Bernstein.
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (114168 => 114169)
--- trunk/Source/WebKit2/ChangeLog 2012-04-13 21:23:13 UTC (rev 114168)
+++ trunk/Source/WebKit2/ChangeLog 2012-04-13 21:29:54 UTC (rev 114169)
@@ -1,5 +1,13 @@
2012-04-13 Anders Carlsson <ander...@apple.com>
+ Make sure that we're using the right compiler for generating derived sources.
+
+ Rubber-stamped by Dan Bernstein.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
+2012-04-13 Anders Carlsson <ander...@apple.com>
+
Include the error if we fail to initialize the web process sandbox
https://bugs.webkit.org/show_bug.cgi?id=83927
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (114168 => 114169)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-04-13 21:23:13 UTC (rev 114168)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2012-04-13 21:29:54 UTC (rev 114169)
@@ -4454,7 +4454,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\n\nexport WebKit2=\"${SRCROOT}\"\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"${WebKit2}/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebKit2\"\n\nexport WebKit2=\"${SRCROOT}\"\n\nif [ ! $CC ]; then\n case $TARGET_GCC_VERSION in\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 \"${WebKit2}/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.availcpu`\nfi\n";
};
E14E99FA14D879DB001D221F /* Add Entitlements */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
