[107829] trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch
jeremyhu at macports.org
jeremyhu at macports.org
Sat Jul 6 09:51:01 PDT 2013
Revision: 107829
https://trac.macports.org/changeset/107829
Author: jeremyhu at macports.org
Date: 2013-07-06 09:51:01 -0700 (Sat, 06 Jul 2013)
Log Message:
-----------
llvm-3.4: Fix patch for Leopard (#39646).
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-07-06 14:58:59 UTC (rev 107828)
+++ trunk/dports/lang/llvm-3.4/files/leopard-no-asan.patch 2013-07-06 16:51:01 UTC (rev 107829)
@@ -1,30 +1,34 @@
-diff -Naurp trunk.orig/projects/compiler-rt/make/platform/clang_darwin.mk trunk/projects/compiler-rt/make/platform/clang_darwin.mk
---- a/projects/compiler-rt/make/platform/clang_darwin.mk 2012-10-11 21:56:32.000000000 -0700
-+++ b/projects/compiler-rt/make/platform/clang_darwin.mk 2012-10-11 22:03:39.000000000 -0700
-@@ -58,11 +58,11 @@ Configs += profile_osx
- UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
+Index: llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk
+===================================================================
+--- 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)
+@@ -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
-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
+#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.
---- a/tools/clang/runtime/compiler-rt/Makefile.orig 2012-10-12 01:42:13.000000000 -0700
-+++ b/tools/clang/runtime/compiler-rt/Makefile 2012-10-12 09:24:08.000000000 -0700
-@@ -75,7 +75,6 @@ ifeq ($(OS),Darwin)
+-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.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.a asan_osx_dynamic.dylib \
- profile_osx.a profile_ios.a
+ profile_osx.a profile_ios.a \
+ ubsan_osx.a
endif
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130706/0459a4f6/attachment.html>
More information about the macports-changes
mailing list