diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-05-05 23:13:50 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-05-05 23:13:50 +0000 |
| commit | ad9daedb695d73c4519201de56af9811f8f17029 (patch) | |
| tree | 288cfdc1d9fcb2bbc2e97a20dbbfd6489b8e4592 | |
| parent | 068324156f233827ae425641e2a384a4b4f0869c (diff) | |
[asan] Fix compiler-rt build.
i386 runtime library was accidentally using the x86_64 version script without a dependency.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@236556 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/asan/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/asan/CMakeLists.txt b/lib/asan/CMakeLists.txt index 6fd98bfd7..f36e2c9a2 100644 --- a/lib/asan/CMakeLists.txt +++ b/lib/asan/CMakeLists.txt @@ -150,8 +150,10 @@ else() LIB clang_rt.asan-${arch} clang_rt.asan_cxx-${arch} EXTRA asan.syms.extra) add_dependencies(asan clang_rt.asan-dynamic-${arch}-version-list) - list(APPEND ASAN_DYNAMIC_LINK_FLAGS + set(VERSION_SCRIPT_FLAG -Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/clang_rt.asan-dynamic-${arch}.vers) + else() + set(VERSION_SCRIPT_FLAG) endif() if (WIN32) @@ -166,6 +168,7 @@ else() ${ASAN_COMMON_RUNTIME_OBJECTS} CFLAGS ${ASAN_DYNAMIC_CFLAGS} LINKFLAGS ${ASAN_DYNAMIC_LINK_FLAGS} + ${VERSION_SCRIPT_FLAG} DEFS ${ASAN_DYNAMIC_DEFINITIONS}) target_link_libraries(clang_rt.asan-dynamic-${arch} ${ASAN_DYNAMIC_LIBS}) add_dependencies(asan clang_rt.asan-dynamic-${arch}) |