Changeset 107828


Ignore:
Timestamp:
Jul 6, 2013, 2:58:59 PM (7 years ago)
Author:
larryv@…
Message:

clang-3.3: Fix patch for Leopard (#39646).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/llvm-3.3/files/leopard-no-asan.patch

    r99791 r107828  
    1 diff -Naurp trunk.orig/projects/compiler-rt/make/platform/clang_darwin.mk trunk/projects/compiler-rt/make/platform/clang_darwin.mk
    2 --- a/projects/compiler-rt/make/platform/clang_darwin.mk        2012-10-11 21:56:32.000000000 -0700
    3 +++ b/projects/compiler-rt/make/platform/clang_darwin.mk        2012-10-11 22:03:39.000000000 -0700
    4 @@ -58,11 +58,11 @@ Configs += profile_osx
    5  UniversalArchs.profile_osx := $(call CheckArches,i386 x86_64,profile_osx)
     1Index: llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk
     2===================================================================
     3--- llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk (revision 185755)
     4+++ llvm-3.3/projects/compiler-rt/make/platform/clang_darwin.mk (working copy)
     5@@ -70,12 +70,12 @@
     6 UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv7,profile_ios)
    67 
    78 # Configurations which define the ASAN support functions.
    89-Configs += asan_osx
    910-UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
    10 -
    11 -Configs += asan_osx_dynamic
    12 -UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
    1311+#Configs += asan_osx
    1412+#UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64,asan_osx)
     
    1715+#UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
    1816 
    19  # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we
    20  # are intended to support and limit what we try to build to that.
    21 --- a/tools/clang/runtime/compiler-rt/Makefile.orig     2012-10-12 01:42:13.000000000 -0700
    22 +++ b/tools/clang/runtime/compiler-rt/Makefile  2012-10-12 09:24:08.000000000 -0700
    23 @@ -75,7 +75,6 @@ ifeq ($(OS),Darwin)
     17-Configs += asan_osx_dynamic
     18-UniversalArchs.asan_osx_dynamic := $(call CheckArches,i386 x86_64,asan_osx_dynamic)
     19-
     20 Configs += ubsan_osx
     21 UniversalArchs.ubsan_osx := $(call CheckArches,i386 x86_64,ubsan_osx)
     22 
     23Index: llvm-3.3/tools/clang/runtime/compiler-rt/Makefile
     24===================================================================
     25--- llvm-3.3/tools/clang/runtime/compiler-rt/Makefile   (revision 185755)
     26+++ llvm-3.3/tools/clang/runtime/compiler-rt/Makefile   (working copy)
     27@@ -75,7 +75,6 @@
    2428 RuntimeDirs += darwin
    2529 RuntimeLibrary.darwin.Configs := \
    2630        eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
    2731-       asan_osx.a asan_osx_dynamic.dylib \
    28         profile_osx.a profile_ios.a
     32        profile_osx.a profile_ios.a \
     33        ubsan_osx.a
    2934 endif
    30  
Note: See TracChangeset for help on using the changeset viewer.