diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-09-10 17:26:42 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-09-10 17:26:42 +0000 |
| commit | d2f2615acc34278a7c6c5e3d75c14266ce1ee513 (patch) | |
| tree | 2e6c4ef82ae615c0484dffec12a5895e444cbcf4 /make | |
| parent | 4a4719cc441e9c45031aca1a024b58fac5ed9edb (diff) | |
| download | compiler-rt-d2f2615acc34278a7c6c5e3d75c14266ce1ee513.tar.gz compiler-rt-d2f2615acc34278a7c6c5e3d75c14266ce1ee513.tar.bz2 compiler-rt-d2f2615acc34278a7c6c5e3d75c14266ce1ee513.tar.xz | |
Revert r163415 in an attempt to bring back the buildbots.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@163522 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
| -rw-r--r-- | make/platform/clang_darwin.mk | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk index 9f9327de..d1788c44 100644 --- a/make/platform/clang_darwin.mk +++ b/make/platform/clang_darwin.mk @@ -61,9 +61,6 @@ UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx) Configs += asan_osx UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx) -Configs += asan_osx_dynamic -UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic) - # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we # are intended to support and limit what we try to build to that. # @@ -98,9 +95,6 @@ CFLAGS.eprintf := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) CFLAGS.10.4 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) # FIXME: We can't build ASAN with our stub SDK yet. CFLAGS.asan_osx := $(CFLAGS) -mmacosx-version-min=10.5 -fno-builtin -CFLAGS.asan_osx_dynamic := \ - $(CFLAGS) -mmacosx-version-min=10.5 -fno-builtin \ - -DMAC_INTERPOSE_FUNCTIONS=1 CFLAGS.osx.i386 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) CFLAGS.osx.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) @@ -109,10 +103,6 @@ CFLAGS.cc_kext.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) CFLAGS.profile_osx.i386 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) CFLAGS.profile_osx.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) -# Configure the asan_osx_dynamic library to be built shared. -SHARED_LIBRARY.asan_osx_dynamic := 1 -LDFLAGS.asan_osx_dynamic := -framework Foundation -lc++ - FUNCTIONS.eprintf := eprintf FUNCTIONS.10.4 := eprintf floatundidf floatundisf floatundixf @@ -122,9 +112,6 @@ FUNCTIONS.profile_osx := GCDAProfiling FUNCTIONS.asan_osx := $(AsanFunctions) $(InterceptionFunctions) \ $(SanitizerCommonFunctions) -FUNCTIONS.asan_osx_dynamic := $(AsanFunctions) $(InterceptionFunctions) \ - $(SanitizerCommonFunctions) \ - $(AsanDynamicFunctions) CCKEXT_COMMON_FUNCTIONS := \ absvdi2 \ |