build/mac/copy_asan_runtime_dylib.sh - Issue 1582823004: Make copy_asan_runtime_dylib.sh handle Clang version number changes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Address comments 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

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..42814903dca0ba6b7feb41e9841fba6a44a01e7e 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »