diff options
| author | Alexander Potapenko <glider@google.com> | 2013-11-22 14:31:50 +0000 |
|---|---|---|
| committer | Alexander Potapenko <glider@google.com> | 2013-11-22 14:31:50 +0000 |
| commit | d5c29a8584d5284ae4cf7e7176efe0692ccde5c0 (patch) | |
| tree | 15a0b119add4b0ddbb37c5fc0ce31efd29b722dc | |
| parent | 0d2a93500c4b071977a9ee89dbc24586fe54bca5 (diff) | |
| download | compiler-rt-d5c29a8584d5284ae4cf7e7176efe0692ccde5c0.tar.gz | |
[ASan] Backport r195125, r195132, r195216 to LLVM 3.4 branch.
These patches should fix building asan_iossim_dynamic (the ASan runtime targeting iOS simulator).
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@195465 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | make/platform/clang_darwin.mk | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c0476b6b..a4424086c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk index 02f0a80fc..ddb702944 100644 --- a/make/platform/clang_darwin.mk +++ b/make/platform/clang_darwin.mk @@ -88,8 +88,11 @@ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios) 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) \ |