diff options
| author | hans <hans@chromium.org> | 2015-11-20 22:07:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-21 06:08:34 +0000 |
| commit | c21ad3ccd0ca211b8403966826ce44b7034daf91 (patch) | |
| tree | 7e523d61da11b5db830fa2330331292ab7d5af66 | |
| parent | 0c9eb038cae670b299c303a5e18547ec85e6e3b0 (diff) | |
| download | chromium_src-c21ad3ccd0ca211b8403966826ce44b7034daf91.zip chromium_src-c21ad3ccd0ca211b8403966826ce44b7034daf91.tar.gz chromium_src-c21ad3ccd0ca211b8403966826ce44b7034daf91.tar.bz2 | |
Revert of Roll clang 247874:253678 (patchset #1 id:1 of https://codereview.chromium.org/1461003007/ )
Reason for revert:
MSan was broken by the roll.
Original issue's description:
> Roll clang 247874:253678
>
> Also revert https://codereview.chromium.org/1375193005 for bootstrap builds,
> else compiler-rt won't build in that config. See comment 45 on the bug.
>
> BUG=538614
> R=thakis@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/src/+/6a0a6e2c285cf215a15755ab9d32b386947a77b1
TBR=thakis@chromium.org,thestig@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=538614, 559530
Review URL: https://codereview.chromium.org/1460503011
Cr-Commit-Position: refs/heads/master@{#361010}
| -rwxr-xr-x | tools/clang/scripts/update.py | 2 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 25 |
2 files changed, 5 insertions, 22 deletions
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index e09b7f4..6cb1400 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -28,7 +28,7 @@ import zipfile # Note: this revision is only used for Windows. Other platforms use update.sh. # TODO(thakis): Use the same revision on Windows and non-Windows. # TODO(thakis): Remove update.sh, use update.py everywhere. -LLVM_WIN_REVISION = '253678' +LLVM_WIN_REVISION = '247874' use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ if use_head_revision: diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index cb34413..5cee97d 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=253678 +CLANG_REVISION=247874 # This is incremented when pushing a new build of Clang at the same revision. CLANG_SUB_REVISION=1 @@ -548,29 +548,12 @@ mkdir -p "${COMPILER_RT_BUILD_DIR}" pushd "${COMPILER_RT_BUILD_DIR}" rm -fv CMakeCache.txt -if [[ -z "${bootstrap}" ]]; then - # compiler_rt doesn't build with Xcode 6's clang, but not all bots have - # Xcode 7 yet. So use the just-built clang for building compiler-rt. - # However, in bootstrap builds, we delete libc++ to work around PR24068 -- so - # compiler_rt's CMake checks can't find <iostream> and decide that no arch - # is supported. So use the installed bootstrap compiler in bootstrap builds, - # it has the libc++ headers installed (CXX is already set to that in - # bootstrap builds). - CC="${ABS_LLVM_BUILD_DIR}/bin/clang" - CXX="${ABS_LLVM_BUILD_DIR}/bin/clang++" -elif [[ "${OS}" = "Darwin" ]]; then - # ...except that compiler-rt currently doesn't build with the bootstrap - # compiler on Darwin either! So use the system compiler there. - # TOOD(thakis): Remove this once http://llvm.org/PR25465 is fixed. - CC=cc - CXX=c++ -fi -MACOSX_DEPLOYMENT_TARGET=${deployment_target} cmake -GNinja \ +MACOSX_DEPLOYMENT_TARGET=${deployment_target} CC="" CXX="" cmake -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DLLVM_ENABLE_ASSERTIONS=ON \ -DLLVM_ENABLE_THREADS=OFF \ - -DCMAKE_C_COMPILER="${CC}" \ - -DCMAKE_CXX_COMPILER="${CXX}" \ + -DCMAKE_C_COMPILER="${ABS_LLVM_BUILD_DIR}/bin/clang" \ + -DCMAKE_CXX_COMPILER="${ABS_LLVM_BUILD_DIR}/bin/clang++" \ -DSANITIZER_MIN_OSX_VERSION="10.7" \ -DLLVM_CONFIG_PATH="${ABS_LLVM_BUILD_DIR}/bin/llvm-config" \ "${ABS_COMPILER_RT_DIR}" |