diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-02 20:39:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-02 20:39:42 +0000 |
| commit | 10f31c7f2f33e9488a1a81e29ada85132e0ec792 (patch) | |
| tree | c4aa57f5c31534b6cea9b7aa4a0c3829f06127a0 | |
| parent | 844250b9cc72054ca0433b79b2cad2e01d1475d2 (diff) | |
| download | chromium_src-10f31c7f2f33e9488a1a81e29ada85132e0ec792.zip chromium_src-10f31c7f2f33e9488a1a81e29ada85132e0ec792.tar.gz chromium_src-10f31c7f2f33e9488a1a81e29ada85132e0ec792.tar.bz2 | |
roll clang 147225:147434
Also set MACOSX_DEPLOYMENT_TARGET to 10.5, so that the mac binaries don't
require 10.6.
BUG=none
TEST=none
TBR=hans
Review URL: http://codereview.chromium.org/9069004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116110 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | tools/clang/scripts/update.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index df9ddb26..4352c98 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -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=147225 +CLANG_REVISION=147434 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" @@ -189,7 +189,7 @@ if [ "${OS}" = "Linux" ]; then elif [ "${OS}" = "Darwin" ]; then NUM_JOBS="$(sysctl -n hw.ncpu)" fi -make -j"${NUM_JOBS}" +MACOSX_DEPLOYMENT_TARGET=10.5 make -j"${NUM_JOBS}" cd - # Build plugin. @@ -203,7 +203,7 @@ cp -R "${PLUGIN_SRC_DIR}" "${PLUGIN_DST_DIR}" rm -rf "${PLUGIN_BUILD_DIR}" mkdir -p "${PLUGIN_BUILD_DIR}" cp "${PLUGIN_SRC_DIR}/Makefile" "${PLUGIN_BUILD_DIR}" -make -j"${NUM_JOBS}" -C "${PLUGIN_BUILD_DIR}" +MACOSX_DEPLOYMENT_TARGET=10.5 make -j"${NUM_JOBS}" -C "${PLUGIN_BUILD_DIR}" if [[ -n "$run_tests" ]]; then # Run a few tests. |