aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBirger J. Nordølum2011-04-10 14:48:37 +0200
committerAdam Vandenberg2011-04-14 11:40:03 -0700
commite00734bf631c3ad0d92f9ab93e3dd0f173057e70 (patch)
treea3359cd02bb26a4c82d67a3c511539c5dab04e59
parentdb127c21a9be5e313a25d811ac672a15e0ee27a7 (diff)
downloadhomebrew-e00734bf631c3ad0d92f9ab93e3dd0f173057e70.tar.bz2
Fixed building LLVM with --shared option.
Fixes #5114. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
-rw-r--r--Library/Formula/llvm.rb20
1 files changed, 10 insertions, 10 deletions
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index 914bb84f4..ed3fcd951 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -6,14 +6,14 @@ def build_shared?; ARGV.include? '--shared'; end
def build_rtti?; ARGV.include? '--rtti'; end
class Clang < Formula
- url 'http://llvm.org/releases/2.9/clang-2.9.tgz'
homepage 'http://llvm.org/'
+ url 'http://llvm.org/releases/2.9/clang-2.9.tgz'
md5 '634de18d04b7a4ded19ec4c17d23cfca'
end
class Llvm < Formula
- url 'http://llvm.org/releases/2.9/llvm-2.9.tgz'
homepage 'http://llvm.org/'
+ url 'http://llvm.org/releases/2.9/llvm-2.9.tgz'
md5 '793138412d2af2c7c7f54615f8943771'
def patches
@@ -77,16 +77,16 @@ end
__END__
-diff --git a/Makefile.rules b/Makefile.rules
-index 9cff105..44d5b2d 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -497,7 +497,7 @@ ifeq ($(HOST_OS),Darwin)
+diff --git i/Makefile.rules w/Makefile.rules
+index 5fc77a5..a6baaf4 100644
+--- i/Makefile.rules
++++ w/Makefile.rules
+@@ -507,7 +507,7 @@ ifeq ($(HOST_OS),Darwin)
# 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/')
-- SharedLinkOptions=-Wl,-flat_namespace -Wl,-undefined,suppress \
-+ SharedLinkOptions=-Wl,-undefined,dynamic_lookup \
- -dynamiclib
+- LoadableModuleOptions := -Wl,-flat_namespace -Wl,-undefined,suppress
++ LoadableModuleOptions := -Wl,-undefined,dynamic_lookup
+ SharedLinkOptions := -dynamiclib
ifneq ($(ARCH),ARM)
SharedLinkOptions += -mmacosx-version-min=$(DARWIN_VERSION)