From 5c105d9f3fd086aff195d3849dcf847d6b0bd927 Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 5 Oct 2012 10:12:53 +0000
Subject: branch Attitude Adjustment

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33625 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 toolchain/llvm/patches/100-darwin_arch_auto.patch     | 19 +++++++++++++++++++
 .../llvm/patches/110-darwin_version_detect.patch      | 16 ++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 toolchain/llvm/patches/100-darwin_arch_auto.patch
 create mode 100644 toolchain/llvm/patches/110-darwin_version_detect.patch

(limited to 'toolchain/llvm/patches')

diff --git a/toolchain/llvm/patches/100-darwin_arch_auto.patch b/toolchain/llvm/patches/100-darwin_arch_auto.patch
new file mode 100644
index 000000000..a48e13121
--- /dev/null
+++ b/toolchain/llvm/patches/100-darwin_arch_auto.patch
@@ -0,0 +1,19 @@
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -618,16 +618,6 @@ ifdef UNIVERSAL
+ 
+   # Building universal cannot compute dependencies automatically.
+   DISABLE_AUTO_DEPENDENCIES=1
+-else
+-  ifeq ($(TARGET_OS),Darwin)
+-    ifeq ($(ARCH),x86_64)
+-      TargetCommonOpts = -m64
+-    else
+-      ifeq ($(ARCH),x86)
+-        TargetCommonOpts = -m32
+-      endif
+-    endif
+-  endif
+ endif
+ 
+ ifeq ($(HOST_OS),SunOS)
diff --git a/toolchain/llvm/patches/110-darwin_version_detect.patch b/toolchain/llvm/patches/110-darwin_version_detect.patch
new file mode 100644
index 000000000..7fd62f93e
--- /dev/null
+++ b/toolchain/llvm/patches/110-darwin_version_detect.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -506,11 +506,13 @@ endif
+ #--------------------------------------------------------------------
+ 
+ ifeq ($(HOST_OS),Darwin)
++  ifndef DARWIN_VERSION
+   DARWIN_VERSION := `sw_vers -productVersion`
+   # Strip a number like 10.4.7 to 10.4
+   DARWIN_VERSION := $(shell echo $(DARWIN_VERSION)| sed -E 's/(10.[0-9]).*/\1/')
+   # Get "4" out of 10.4 for later pieces in the makefile.
+   DARWIN_MAJVERS := $(shell echo $(DARWIN_VERSION)| sed -E 's/10.([0-9]).*/\1/')
++  endif
+ 
+   SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined -Wl,suppress \
+                     -dynamiclib
-- 
cgit v1.2.3