diff options
| -rw-r--r-- | compiler-rt/lib/asan/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index 6dd871f56c3..6251f06d359 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -1,12 +1,5 @@ # Build for the AddressSanitizer runtime support library. -if(APPLE) -# Don't set rpath for the ASan libraries. Developers are encouraged to ship -# their binaries together with the corresponding ASan runtime libraries, -# so they'll anyway need to fix the rpath and the install name. -set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) -endif() - set(ASAN_SOURCES asan_allocator2.cc asan_activation.cc diff --git a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c index 79e78d68167..8680d678cf9 100644 --- a/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c +++ b/compiler-rt/test/asan/TestCases/Darwin/interface_symbols_darwin.c @@ -5,9 +5,7 @@ // RUN: %clang_asan -dead_strip -O2 %s -o %t.exe // RUN: rm -f %t.symbols %t.interface -// RUN: nm -g `otool -L %t.exe | grep "asan_osx_dynamic.dylib" | \ -// RUN: tr -d '\011' | \ -// RUN: sed "s/.dylib.*/.dylib/"` \ +// RUN: nm -g `%clang_asan %s -fsanitize=address -### 2>&1 | grep "libclang_rt.asan_osx_dynamic.dylib" | sed -e 's/.*"\(.*libclang_rt.asan_osx_dynamic.dylib\)".*/\1/'` \ // RUN: | grep " T " | sed "s/.* T //" \ // RUN: | grep "__asan_" | sed "s/___asan_/__asan_/" \ // RUN: | sed -E "s/__asan_init_v[0-9]+/__asan_init/" \ |
