Commit 4e8d565a authored by ddkilzer@apple.com's avatar ddkilzer@apple.com
Browse files

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108836 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a5bd2cc3
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> 2012-02-24 James Robinson <jamesr@chromium.org>
   
Create a watchlist for ScrollingCoordinator changes Create a watchlist for ScrollingCoordinator changes
...@@ -545,7 +545,7 @@ ...@@ -545,7 +545,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; 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 */ /* End PBXShellScriptBuildPhase section */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment