diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 08:54:32 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-18 08:54:32 +0000 |
| commit | b6ec7d71d89d6853291580b652a94e7a627bc340 (patch) | |
| tree | 527db50b399adff9b74a7b4c323a5499aeafbd5f | |
| parent | d6b2e01dec1c5c22d2b0f70db034d3d059c5917a (diff) | |
| download | chromium_src-b6ec7d71d89d6853291580b652a94e7a627bc340.zip chromium_src-b6ec7d71d89d6853291580b652a94e7a627bc340.tar.gz chromium_src-b6ec7d71d89d6853291580b652a94e7a627bc340.tar.bz2 | |
roll clang 163126:163674, roll gyp 1492:1495
gyp changes:
1493: Fix ninja generator to recognize the 'default_target' flag.
1494, 1495: ninja: Survive case-only file renames on case-insensitive filesystems.
1494 requires a one-time clobber-build on OS X.
Conveniently, clang rolls cause clobber builds,
so roll gyp at the same time as clang. (Change the
clobber logic to delete .d files too for this roll.
I'll undo this at the next roll.)
BUG=none
TBR=hans
Review URL: https://codereview.chromium.org/10939009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157318 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 3 |
2 files changed, 3 insertions, 4 deletions
@@ -103,9 +103,7 @@ deps = { (Var("googlecode_url") % "grit-i18n") + "/trunk@67", "src/tools/gyp": - # DO NOT ROLL GYP. The next gyp roll needs some tricks to work. - # Talk to thakis@ for details. (I'll try to get this fixed by friday.) - (Var("googlecode_url") % "gyp") + "/trunk@1492", + (Var("googlecode_url") % "gyp") + "/trunk@1495", "src/v8": (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"), diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 0359306..b1947f5c 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -8,7 +8,7 @@ # Do NOT CHANGE this if you don't know what you're doing -- see # https://code.google.com/p/chromium/wiki/UpdatingClang # Reverting problematic clang rolls is safe, though. -CLANG_REVISION=163126 +CLANG_REVISION=163674 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" @@ -145,6 +145,7 @@ for CONFIG in Debug Release; do echo "Clobbering ${CONFIG} PCH and .o files for ninja build" find "${MAKE_DIR}/${CONFIG}/obj" -name '*.gch' -exec rm {} + find "${MAKE_DIR}/${CONFIG}/obj" -name '*.o' -exec rm {} + + find "${MAKE_DIR}/${CONFIG}/obj" -name '*.o.d' -exec rm {} + fi if [[ "${OS}" = "Darwin" ]]; then |