[compiler-rt] r216533 - [asan] Restore asan-rt name on linux back to pre-r216380.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Aug 27 04:46:54 2014
New Revision: 216533

URL: http://llvm.org/viewvc/llvm-project?rev=216533&view=rev
Log:
[asan] Restore asan-rt name on linux back to pre-r216380.

There is no reason to have different library names for shared and static
cases on linux. It also breaks Android where we install the shared asan-rt
library into the system and should keep the old name.

This change reverts most of r216380 limiting it to win32 targets only.

Modified:
    compiler-rt/trunk/lib/asan/CMakeLists.txt

Modified: compiler-rt/trunk/lib/asan/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/CMakeLists.txt?rev=216533&r1=216532&r2=216533&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/asan/CMakeLists.txt Wed Aug 27 04:46:54 2014
@@ -163,8 +163,14 @@ else()
         DEFS ${ASAN_COMMON_DEFINITIONS})
       add_dependencies(asan clang_rt.asan-preinit-${arch})
 
+      if (WIN32)
+         set(SHARED_ASAN_NAME clang_rt.asan_dynamic-${arch})
+      else()
+         set(SHARED_ASAN_NAME clang_rt.asan-${arch})
+      endif()
+
       add_compiler_rt_runtime(clang_rt.asan-dynamic-${arch} ${arch} SHARED
-        OUTPUT_NAME clang_rt.asan_dynamic-${arch}
+        OUTPUT_NAME ${SHARED_ASAN_NAME}
         SOURCES $<TARGET_OBJECTS:RTAsan_dynamic.${arch}>
                 ${ASAN_COMMON_RUNTIME_OBJECTS}
         CFLAGS ${ASAN_DYNAMIC_CFLAGS}