diff options
| author | James <> | 2013-03-17 12:16:37 +0000 |
|---|---|---|
| committer | James <> | 2013-03-17 12:16:37 +0000 |
| commit | 27b76ab0671089c47506615a796a261e993896a7 (patch) | |
| tree | 61213d67e7fa87b20356b23798558e2c4212c42f /toolchain/llvm/patches/.svn/text-base | |
| download | trunk-36060-master.tar.gz trunk-36060-master.tar.bz2 trunk-36060-master.zip | |
Diffstat (limited to 'toolchain/llvm/patches/.svn/text-base')
| -rw-r--r-- | toolchain/llvm/patches/.svn/text-base/100-darwin_arch_auto.patch.svn-base | 19 | ||||
| -rw-r--r-- | toolchain/llvm/patches/.svn/text-base/110-darwin_version_detect.patch.svn-base | 16 |
2 files changed, 35 insertions, 0 deletions
diff --git a/toolchain/llvm/patches/.svn/text-base/100-darwin_arch_auto.patch.svn-base b/toolchain/llvm/patches/.svn/text-base/100-darwin_arch_auto.patch.svn-base new file mode 100644 index 0000000..a48e131 --- /dev/null +++ b/toolchain/llvm/patches/.svn/text-base/100-darwin_arch_auto.patch.svn-base @@ -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/.svn/text-base/110-darwin_version_detect.patch.svn-base b/toolchain/llvm/patches/.svn/text-base/110-darwin_version_detect.patch.svn-base new file mode 100644 index 0000000..7fd62f9 --- /dev/null +++ b/toolchain/llvm/patches/.svn/text-base/110-darwin_version_detect.patch.svn-base @@ -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 |