Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: tools/clang/scripts/update.sh

Issue 1148483002: Clang update.sh: fix logical or-expression (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: simplify Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env bash 1 #!/usr/bin/env bash
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 # This script will check out llvm and clang into third_party/llvm and build it. 6 # This script will check out llvm and clang into third_party/llvm and build it.
7 7
8 # Do NOT CHANGE this if you don't know what you're doing -- see 8 # Do NOT CHANGE this if you don't know what you're doing -- see
9 # https://code.google.com/p/chromium/wiki/UpdatingClang 9 # https://code.google.com/p/chromium/wiki/UpdatingClang
10 # Reverting problematic clang rolls is safe, though. 10 # Reverting problematic clang rolls is safe, though.
(...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 -DCMAKE_CXX_FLAGS="--target=arm-linux-androideabi --sysroot=${PWD}/../andr oid-toolchain/sysroot -B${PWD}/../android-toolchain" \ 691 -DCMAKE_CXX_FLAGS="--target=arm-linux-androideabi --sysroot=${PWD}/../andr oid-toolchain/sysroot -B${PWD}/../android-toolchain" \
692 -DANDROID=1 \ 692 -DANDROID=1 \
693 "${ABS_COMPILER_RT_DIR}" 693 "${ABS_COMPILER_RT_DIR}"
694 ninja libclang_rt.asan-arm-android.so 694 ninja libclang_rt.asan-arm-android.so
695 695
696 # And copy it into the main build tree. 696 # And copy it into the main build tree.
697 cp "$(find -name libclang_rt.asan-arm-android.so)" "${ABS_LLVM_CLANG_LIB_DIR}/ lib/linux/" 697 cp "$(find -name libclang_rt.asan-arm-android.so)" "${ABS_LLVM_CLANG_LIB_DIR}/ lib/linux/"
698 popd 698 popd
699 fi 699 fi
700 700
701 if [[ -n "$run_tests" -o -n ${LLVM_FORCE_HEAD_REVISION:-''} ]]; then 701 if [[ -n "$run_tests" || -n "${LLVM_FORCE_HEAD_REVISION:-''}" ]]; then
702 # Run Chrome tool tests. 702 # Run Chrome tool tests.
703 ninja -C "${LLVM_BUILD_DIR}" cr-check-all 703 ninja -C "${LLVM_BUILD_DIR}" cr-check-all
704 fi 704 fi
705 if [[ -n "$run_tests" ]]; then 705 if [[ -n "$run_tests" ]]; then
706 # Run the LLVM and Clang tests. 706 # Run the LLVM and Clang tests.
707 ninja -C "${LLVM_BUILD_DIR}" check-all 707 ninja -C "${LLVM_BUILD_DIR}" check-all
708 fi 708 fi
709 709
710 # After everything is done, log success for this revision. 710 # After everything is done, log success for this revision.
711 echo "${PACKAGE_VERSION}" > "${STAMP_FILE}" 711 echo "${PACKAGE_VERSION}" > "${STAMP_FILE}"
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698