Skip to content
Permalink
Browse files
Use xcrun to find compiler paths for Generate Derived Sources build p…
…hase 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.

Canonical link: https://commits.webkit.org/96610@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@108836 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
ddkilzer committed Feb 24, 2012
1 parent caf6cc3 commit e17b10ff326a4b97284531b7518c64443311a3e0
Showing 2 changed files with 12 additions and 1 deletion.
@@ -1,3 +1,14 @@
2012-02-24 David Kilzer <ddkilzer@apple.com>

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 <jamesr@chromium.org>

Create a watchlist for ScrollingCoordinator changes
@@ -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 */

0 comments on commit e17b10f

Please sign in to comment.