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

Unified Diff: build/mac/copy_asan_runtime_dylib.sh

Issue 1582823004: Make copy_asan_runtime_dylib.sh handle Clang version number changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/mac/copy_asan_runtime_dylib.sh
diff --git a/build/mac/copy_asan_runtime_dylib.sh b/build/mac/copy_asan_runtime_dylib.sh
index f221c4a66dd83bbccaee2d11b0ee35bfb130b47d..63e88ca34489edb6da47f5c401345af4373c8092 100755
--- a/build/mac/copy_asan_runtime_dylib.sh
+++ b/build/mac/copy_asan_runtime_dylib.sh
@@ -38,9 +38,7 @@ 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}")
+ASAN_DYLIB="../../third_party/llvm-build/Release+Asserts/lib/clang/$(python ../../tools/clang/scripts/update.py --print-clang-version)/lib/darwin/${ASAN_DYLIB_NAME}"
Nico 2016/01/14 17:05:18 you probably want to keep ${BUILT_PRODUCTS_DIR} at
hans 2016/01/14 17:35:56 Gah, I somehow missed that one.
DYLIB_BASENAME=$(basename "${ASAN_DYLIB}")
if [[ "${DYLIB_BASENAME}" != "${ASAN_DYLIB_NAME}" ]]; then
« 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