Skip to content

Commit 2398bc5

Browse files
author
Dane Springmeyer
committed
whittle the setup.sh further
1 parent 44211bf commit 2398bc5

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

scripts/setup.sh

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
set -eu
44
set -o pipefail
55

6-
export MASON_RELEASE="${MASON_RELEASE:-eeba3b5}"
7-
export MASON_LLVM_RELEASE="${MASON_LLVM_RELEASE:-5.0.0}"
8-
96
function run() {
107
local config=${1}
118
# unbreak bash shell due to rvm bug on osx: https://github.com/direnv/direnv/issues/210#issuecomment-203383459
@@ -20,14 +17,8 @@ function run() {
2017

2118
echo "export PATH=$(pwd)/.mason:$(pwd)/mason_packages/.link/bin:"'${PATH}' > ${config}
2219
echo "export CXX=${CXX:-$(pwd)/mason_packages/.link/bin/clang++}" >> ${config}
23-
echo "export MASON_LLVM_RELEASE=${MASON_LLVM_RELEASE}" >> ${config}
2420
# https://github.com/google/sanitizers/wiki/AddressSanitizerAsDso
25-
RT_BASE=$(pwd)/mason_packages/.link/lib/clang/${MASON_LLVM_RELEASE}/lib/$(uname | tr A-Z a-z)/libclang_rt
26-
if [[ $(uname -s) == 'Darwin' ]]; then
27-
RT_PRELOAD=${RT_BASE}.asan_osx_dynamic.dylib
28-
else
29-
RT_PRELOAD=${RT_BASE}.asan-x86_64.so
30-
fi
21+
RT_PRELOAD=$(pwd)/$(ls mason_packages/.link/lib/clang/*/lib/*/libclang_rt.asan*)
3122
echo "export MASON_LLVM_RT_PRELOAD=${RT_PRELOAD}" >> ${config}
3223
SUPPRESSION_FILE="/tmp/leak_suppressions.txt"
3324
echo "leak:__strdup" > ${SUPPRESSION_FILE}

0 commit comments

Comments
 (0)