[llvm-branch-commits] [compiler-rt-branch] r195465 - [ASan] Backport r195125, r195132, r195216 to LLVM 3.4 branch.

[Alexander Potapenko]

Author: glider
Date: Fri Nov 22 08:31:50 2013
New Revision: 195465

URL: http://llvm.org/viewvc/llvm-project?rev=195465&view=rev
Log:
[ASan] Backport r195125, r195132, r195216 to LLVM 3.4 branch.

These patches should fix building asan_iossim_dynamic (the ASan runtime targeting iOS simulator).


Modified:
    compiler-rt/branches/release_34/CMakeLists.txt
    compiler-rt/branches/release_34/make/platform/clang_darwin.mk

Modified: compiler-rt/branches/release_34/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/CMakeLists.txt?rev=195465&r1=195464&r2=195465&view=diff
==============================================================================
--- compiler-rt/branches/release_34/CMakeLists.txt (original)
+++ compiler-rt/branches/release_34/CMakeLists.txt Fri Nov 22 08:31:50 2013
@@ -204,7 +204,7 @@ if(APPLE)
   set(DARWIN_iossim_LINKFLAGS
     -Wl,-ios_simulator_version_min,7.0.0
     -mios-simulator-version-min=7.0
-    -Wl,-syslibroot,${IOSSIM_SDK_DIR})
+    -isysroot ${IOSSIM_SDK_DIR})
 endif()
 
 # Architectures supported by Sanitizer runtimes. Specific sanitizers may

Modified: compiler-rt/branches/release_34/make/platform/clang_darwin.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_34/make/platform/clang_darwin.mk?rev=195465&r1=195464&r2=195465&view=diff
==============================================================================
--- compiler-rt/branches/release_34/make/platform/clang_darwin.mk (original)
+++ compiler-rt/branches/release_34/make/platform/clang_darwin.mk Fri Nov 22 08:31:50 2013
@@ -88,8 +88,11 @@ UniversalArchs.profile_ios := $(call Che
 Configs += asan_osx_dynamic
 UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
 
+IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
+ifneq ($(IOSSIM_SDK_PATH),)
 Configs += asan_iossim_dynamic
 UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic)
+endif
 
 Configs += ubsan_osx
 UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
@@ -150,7 +153,6 @@ CFLAGS.asan_osx_dynamic := \
 	-DMAC_INTERPOSE_FUNCTIONS=1 \
   -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=1
 
-IOSSIM_SDK_PATH := $(call XCRunSdkPath,iphonesimulator)
 CFLAGS.asan_iossim_dynamic := \
 	$(CFLAGS) -mios-simulator-version-min=7.0 \
         -isysroot $(IOSSIM_SDK_PATH) \