From 7e13b374959b2eb0e8263ba3a81858556a41367e Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Sun, 6 Jan 2019 21:27:15 +0000
Subject: [PATCH] ENV: default CFLAGS to bottle values.

This reduces the deviation in compilation flags on a given OS between
users and between bottling/not bottling to provide a consistent
behaviour for debugging and support.
---
 Library/Homebrew/extend/ENV/shared.rb         |  9 ++++++
 Library/Homebrew/extend/ENV/std.rb            | 31 +++++--------------
 Library/Homebrew/extend/ENV/super.rb          | 15 +--------
 .../Homebrew/extend/os/mac/extend/ENV/std.rb  |  4 +--
 4 files changed, 20 insertions(+), 39 deletions(-)

diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index 9442fb17ba..a063c9dba4 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -274,6 +274,15 @@ module SharedEnvExtension
     append "LDFLAGS", "-B#{ld64.bin}/"
   end
 
+  # @private
+  def effective_arch
+    if ARGV.build_bottle? && ARGV.bottle_arch
+      ARGV.bottle_arch
+    else
+      Hardware.oldest_cpu
+    end
+  end
+
   # @private
   def gcc_version_formula(name)
     version = name[GNU_GCC_REGEXP, 1]
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb
index acc41ad695..68fedab6a1 100644
--- a/Library/Homebrew/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/ENV/std.rb
@@ -7,7 +7,6 @@ module Stdenv
 
   # @private
   SAFE_CFLAGS_FLAGS = "-w -pipe".freeze
-  DEFAULT_FLAGS = "-march=native".freeze
 
   # @private
   def setup_build_environment(formula = nil)
@@ -103,12 +102,12 @@ module Stdenv
 
   def gcc_4_0
     super
-    set_cpu_cflags "-march=nocona -mssse3"
+    set_cpu_cflags
   end
 
   def gcc_4_2
     super
-    set_cpu_cflags "-march=core2 -msse4"
+    set_cpu_cflags
   end
 
   GNU_GCC_VERSIONS.each do |n|
@@ -123,8 +122,8 @@ module Stdenv
     replace_in_cflags(/-Xarch_#{Hardware::CPU.arch_32_bit} (-march=\S*)/, '\1')
     # Clang mistakenly enables AES-NI on plain Nehalem
     map = Hardware::CPU.optimization_flags
-    map = map.merge(nehalem: "-march=native -Xclang -target-feature -Xclang -aes")
-    set_cpu_cflags DEFAULT_FLAGS, map
+                       .merge(nehalem: "-march=nehalem -Xclang -target-feature -Xclang -aes")
+    set_cpu_cflags map
   end
 
   def minimal_optimization
@@ -199,7 +198,7 @@ module Stdenv
   # Sets architecture-specific flags for every environment variable
   # given in the list `flags`.
   # @private
-  def set_cpu_flags(flags, default = DEFAULT_FLAGS, map = Hardware::CPU.optimization_flags)
+  def set_cpu_flags(flags, map = Hardware::CPU.optimization_flags)
     cflags =~ /(-Xarch_#{Hardware::CPU.arch_32_bit} )-march=/
     xarch = Regexp.last_match(1).to_s
     remove flags, /(-Xarch_#{Hardware::CPU.arch_32_bit} )?-march=\S*/
@@ -207,29 +206,15 @@ module Stdenv
     remove flags, /-mssse3/
     remove flags, /-msse4(\.\d)?/
     append flags, xarch unless xarch.empty?
-    append flags, map.fetch(effective_arch, default)
+    append flags, map.fetch(effective_arch)
   end
   alias generic_set_cpu_flags set_cpu_flags
 
   def x11; end
 
   # @private
-  def effective_arch
-    if ARGV.build_bottle?
-      ARGV.bottle_arch || Hardware.oldest_cpu
-    elsif Hardware::CPU.intel? && !Hardware::CPU.sse4?
-      # If the CPU doesn't support SSE4, we cannot trust -march=native or
-      # -march=<cpu family> to do the right thing because we might be running
-      # in a VM or on a Hackintosh.
-      Hardware.oldest_cpu
-    else
-      Hardware::CPU.family
-    end
-  end
-
-  # @private
-  def set_cpu_cflags(default = DEFAULT_FLAGS, map = Hardware::CPU.optimization_flags)
-    set_cpu_flags CC_FLAG_VARS, default, map
+  def set_cpu_cflags(map = Hardware::CPU.optimization_flags)
+    set_cpu_flags CC_FLAG_VARS, map
   end
 
   def make_jobs
diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb
index 9dec1b01f1..4236f3b5e2 100644
--- a/Library/Homebrew/extend/ENV/super.rb
+++ b/Library/Homebrew/extend/ENV/super.rb
@@ -230,20 +230,7 @@ module Superenv
   end
 
   def determine_optflags
-    if ARGV.build_bottle?
-      arch = ARGV.bottle_arch || Hardware.oldest_cpu
-      Hardware::CPU.optimization_flags.fetch(arch)
-    # If the CPU doesn't support SSE4, we cannot trust -march=native or
-    # -march=<cpu family> to do the right thing because we might be running
-    # in a VM or on a Hackintosh.
-    elsif Hardware::CPU.intel? && !Hardware::CPU.sse4?
-      Hardware::CPU.optimization_flags.fetch(Hardware.oldest_cpu)
-    elsif ![:gcc_4_0, :gcc_4_2].include?(compiler)
-      "-march=native"
-    # This is mutated elsewhere, so return an empty string in this case
-    else
-      ""
-    end
+    Hardware::CPU.optimization_flags.fetch(effective_arch)
   end
 
   def determine_cccfg
diff --git a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
index 1ae63fd5d4..9af8025968 100644
--- a/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
+++ b/Library/Homebrew/extend/os/mac/extend/ENV/std.rb
@@ -67,8 +67,8 @@ module Stdenv
   # Sets architecture-specific flags for every environment variable
   # given in the list `flags`.
   # @private
-  def set_cpu_flags(flags, default = DEFAULT_FLAGS, map = Hardware::CPU.optimization_flags)
-    generic_set_cpu_flags(flags, default, map)
+  def set_cpu_flags(flags, map = Hardware::CPU.optimization_flags)
+    generic_set_cpu_flags(flags, map)
 
     # Works around a buggy system header on Tiger
     append flags, "-faltivec" if MacOS.version == :tiger