aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorMisty De Meo2014-04-29 19:11:34 -0700
committerMisty De Meo2014-04-30 08:21:54 -0700
commit9ca1700232eed8a7deb3d8b07157712d8383bf09 (patch)
treef94d1831e3cf9413c929df591361aaed93c76d08 /Library
parent1f660e87b1fd9a8cfc1b21d1b3ef6b19e8825ee9 (diff)
downloadhomebrew-9ca1700232eed8a7deb3d8b07157712d8383bf09.tar.bz2
Superenv: determine_optflags should return a string
This is saved in HOMEBREW_OPTFLAGS and later mutated by ENV.universal_binary, so if this returns nil the sub will fail.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/extend/ENV/super.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index a0efec453..940cc36d2 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -207,8 +207,11 @@ module Superenv
Hardware::CPU.optimization_flags.fetch(arch)
elsif Hardware::CPU.intel? && !Hardware::CPU.sse4?
Hardware::CPU.optimization_flags.fetch(Hardware.oldest_cpu)
+ elsif compiler == :clang
+ "-march=native"
+ # This is mutated elsewhere, so return an empty string in this case
else
- "-march=native" if compiler == :clang
+ ""
end
end