[113977] trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch

[jeremyhu at macports.org]

Revision: 113977
          https://trac.macports.org/changeset/113977
Author:   jeremyhu at macports.org
Date:     2013-11-26 14:10:51 -0800 (Tue, 26 Nov 2013)
Log Message:
-----------
llvm-3.4: Revert accidental commit

Modified Paths:
--------------
    trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch

Modified: trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch
===================================================================
--- trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch	2013-11-26 22:09:25 UTC (rev 113976)
+++ trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch	2013-11-26 22:10:51 UTC (rev 113977)
@@ -2,26 +2,33 @@
 ===================================================================
 --- llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk	(revision 185755)
 +++ llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk	(working copy)
-@@ -81,8 +81,8 @@ Configs += profile_ios
+@@ -70,12 +70,12 @@
  UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
  
  # Configurations which define the ASAN support functions.
--Configs += asan_osx_dynamic
--UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
+-Configs += asan_osx
+-UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_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)
  
+-Configs += asan_osx_dynamic
+-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
+-
  Configs += ubsan_osx
  UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
+ 
 Index: llvm-3.3/tools/clang/runtime/compiler-rt/Makefile
 ===================================================================
---- llvm-3.4/tools/clang/runtime/compiler-rt/Makefile	(revision 185755)
-+++ llvm-3.4/tools/clang/runtime/compiler-rt/Makefile	(working copy)
-@@ -77,7 +77,6 @@ ifeq ($(OS),Darwin)
+--- llvm-3.3/tools/clang/runtime/compiler-rt/Makefile	(revision 185755)
++++ llvm-3.3/tools/clang/runtime/compiler-rt/Makefile	(working copy)
+@@ -75,7 +75,6 @@
  RuntimeDirs += darwin
  RuntimeLibrary.darwin.Configs := \
  	eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
--	asan_osx_dynamic.dylib \
+-	asan_osx.a asan_osx_dynamic.dylib \
  	profile_osx.a profile_ios.a \
  	ubsan_osx.a
  endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131126/438834f5/attachment.html>