diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-06-05 12:49:35 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2014-06-05 12:49:35 +0000 |
| commit | 57eba53a015e1541e6d8a89382a23d9adc7ebf3b (patch) | |
| tree | f42a22a339826c800d9bb0a39491658dcb2fc837 | |
| parent | 8065fb761eee95e2131d55e2b9bf3ed73555700a (diff) | |
| download | bcm5719-llvm-57eba53a015e1541e6d8a89382a23d9adc7ebf3b.tar.gz bcm5719-llvm-57eba53a015e1541e6d8a89382a23d9adc7ebf3b.zip | |
[asan] asan_device_setup: extend search path
In standalone build asan-rt is stored in yet another path.
llvm-svn: 210259
| -rwxr-xr-x | compiler-rt/lib/asan/scripts/asan_device_setup | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/scripts/asan_device_setup b/compiler-rt/lib/asan/scripts/asan_device_setup index db6346bdb1c..261e2c6a47d 100755 --- a/compiler-rt/lib/asan/scripts/asan_device_setup +++ b/compiler-rt/lib/asan/scripts/asan_device_setup @@ -97,8 +97,8 @@ elif [[ -f "$HERE/$ASAN_RT" ]]; then ASAN_RT_PATH="$HERE" elif [[ $(basename "$HERE") == "bin" ]]; then # We could be in the toolchain's base directory. - # Consider ../lib and ../lib/clang/$VERSION/lib/linux. - P=$(ls "$HERE"/../lib/"$ASAN_RT" "$HERE"/../lib/clang/*/lib/linux/"$ASAN_RT" 2>/dev/null | sort | tail -1) + # Consider ../lib, ../lib/asan and ../lib/clang/$VERSION/lib/linux. + P=$(ls "$HERE"/../lib/"$ASAN_RT" "$HERE"/../lib/asan/"$ASAN_RT" "$HERE"/../lib/clang/*/lib/linux/"$ASAN_RT" 2>/dev/null | sort | tail -1) if [[ -n "$P" ]]; then ASAN_RT_PATH="$(dirname "$P")" fi |
