diff options
author | Hans Wennborg <hans@chromium.org> | 2016-01-14 10:10:00 -0800 |
---|---|---|
committer | Hans Wennborg <hans@chromium.org> | 2016-01-14 18:14:26 +0000 |
commit | 439cedca2e412836e410e8b9b22679d0d4c74452 (patch) | |
tree | 64b35c14774684ce603cba7d51141f05e5ed5057 /build | |
parent | 449cd689cbd05602139072b601d890082d2da078 (diff) | |
download | chromium_src-439cedca2e412836e410e8b9b22679d0d4c74452.zip chromium_src-439cedca2e412836e410e8b9b22679d0d4c74452.tar.gz chromium_src-439cedca2e412836e410e8b9b22679d0d4c74452.tar.bz2 |
Make copy_asan_runtime_dylib.sh handle Clang version number changes
There's no need to use 'find' here; the script should ask update.py
for the version number.
BUG=none
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/1582823004 .
Cr-Commit-Position: refs/heads/master@{#369464}
Diffstat (limited to 'build')
-rwxr-xr-x | build/mac/copy_asan_runtime_dylib.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/mac/copy_asan_runtime_dylib.sh b/build/mac/copy_asan_runtime_dylib.sh index f221c4a..4281490 100755 --- a/build/mac/copy_asan_runtime_dylib.sh +++ b/build/mac/copy_asan_runtime_dylib.sh @@ -38,9 +38,9 @@ fi # TODO(glider): this doesn't work if we set CC and CXX to override the default # Clang. -ASAN_DYLIB=$(find \ - "${BUILT_PRODUCTS_DIR}/../../third_party/llvm-build/Release+Asserts/lib/clang/" \ - -type f -path "*${ASAN_DYLIB_NAME}") +SRCROOT="${BUILT_PRODUCTS_DIR}/../.." +CLANGVER=$(python ${SRCROOT}/tools/clang/scripts/update.py --print-clang-version) +ASAN_DYLIB=${SRCROOT}/third_party/llvm-build/Release+Asserts/lib/clang/${CLANGVER}/lib/darwin/${ASAN_DYLIB_NAME} DYLIB_BASENAME=$(basename "${ASAN_DYLIB}") if [[ "${DYLIB_BASENAME}" != "${ASAN_DYLIB_NAME}" ]]; then |