diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 13:27:34 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 13:27:34 +0000 |
| commit | 50903e7c854554957e98e70344d48466da15405a (patch) | |
| tree | 287745e9d3bfe13116dd1eb7d148efeaac9d31f8 | |
| parent | 5e4fe90b82a7b728a55228a61deba782810af36a (diff) | |
| download | chromium_src-50903e7c854554957e98e70344d48466da15405a.zip chromium_src-50903e7c854554957e98e70344d48466da15405a.tar.gz chromium_src-50903e7c854554957e98e70344d48466da15405a.tar.bz2 | |
Detect whether we're in a WebKit checkout to find the correct make output directory
BUG=WK-75622
TEST=create a WebKit/chromium/mac/make checkout, update clang, should delete GCH fiels
Review URL: https://chromiumcodereview.appspot.com/9231007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118288 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | tools/clang/scripts/update.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 3678e97..341f47a 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -102,7 +102,15 @@ rm -f "${STAMP_FILE}" # created them. if [[ "${OS}" = "Darwin" ]]; then XCODEBUILD_DIR="${THIS_DIR}/../../../xcodebuild" - MAKE_DIR="${THIS_DIR}/../../../out" + if [ -f "${THIS_DIR}/../../../WebKit.gyp" ]; then + # We're inside a WebKit checkout. + # TODO(thakis): try to unify the directory layout of the xcode- and + # make-based builds. http://crbug.com/110455 + MAKE_DIR="${THIS_DIR}/../../../../../../out" + else + # We're inside a Chromium checkout. + MAKE_DIR="${THIS_DIR}/../../../out" + fi for CONFIG in Debug Release; do if [[ -d "${MAKE_DIR}/${CONFIG}/obj.target" ]]; then echo "Clobbering ${CONFIG} PCH files for make build" |