aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisty De Meo2013-10-18 08:37:14 -0700
committerMisty De Meo2013-10-18 08:38:44 -0700
commit81b0f33b7a7ecb96e9df2606dd5ac1fad21847cf (patch)
tree29fce3536861eda4ec5b8b5039cdd9f514cf870f
parente903d78baa7aa9417d788157bed25a9944d91571 (diff)
downloadhomebrew-81b0f33b7a7ecb96e9df2606dd5ac1fad21847cf.tar.bz2
serf: fix universal build
Fixes #23342.
-rw-r--r--Library/Formula/serf.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/Library/Formula/serf.rb b/Library/Formula/serf.rb
index 231a24295..4528392be 100644
--- a/Library/Formula/serf.rb
+++ b/Library/Formula/serf.rb
@@ -25,6 +25,12 @@ class Serf < Formula
end
def install
+ # SConstruct merges in gssapi linkflags using scons's MergeFlags,
+ # but that discards duplicate values - including the duplicate
+ # values we want, like multiple -arch values for a universal build.
+ # Passing 0 as the `unique` kwarg turns this behaviour off.
+ inreplace 'SConstruct', 'unique=1', 'unique=0'
+
ENV.universal_binary if build.universal?
# scons ignores our compiler and flags unless explicitly passed
args = %W[PREFIX=#{prefix} GSSAPI=/usr CC=#{ENV.cc}