Ticket #48602: clang_darwin.mk.rej

File clang_darwin.mk.rej, 1.6 KB (added by udbraumann, 9 years ago)
Line 
1***************
2*** 119,134 ****
3  UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
4 
5  # Configurations which define the ASAN support functions.
6- Configs += asan_osx_dynamic
7  UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
8 
9- Configs += asan_iossim_dynamic
10  UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
11 
12- Configs += ubsan_osx_dynamic
13  UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx_dynamic,$(OSX_SDK))
14 
15- Configs += ubsan_iossim_dynamic
16  UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
17 
18  # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM
19--- 119,134 ----
20  UniversalArchs.profile_ios += $(call CheckArches,armv7 arm64,profile_ios,$(IOS_SDK))
21 
22  # Configurations which define the ASAN support functions.
23+ #Configs += asan_osx_dynamic
24  UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,asan_osx_dynamic,$(OSX_SDK))
25 
26+ #Configs += asan_iossim_dynamic
27  UniversalArchs.asan_iossim_dynamic := $(call CheckArches,i386 x86_64,asan_iossim_dynamic,$(IOSSIM_SDK))
28 
29+ #Configs += ubsan_osx_dynamic
30  UniversalArchs.ubsan_osx_dynamic := $(call CheckArches,i386 x86_64 x86_64h,ubsan_osx_dynamic,$(OSX_SDK))
31 
32+ #Configs += ubsan_iossim_dynamic
33  UniversalArchs.ubsan_iossim_dynamic := $(call CheckArches,i386 x86_64,ubsan_iossim_dynamic,$(IOSSIM_SDK))
34 
35  # Darwin 10.6 has a bug in cctools that makes it unable to use ranlib on our ARM