admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #5500 from claui/fix-cop-set-writer

Browse Source 
Disable cop for #set_cpu_flags, #set_cpu_cflags
This commit is contained in:
Mike McQuaid 2019-01-08 12:46:33 +00:00 committed by GitHub
commit 5d602a3cdc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/ENV/std.rb
View File

@ -198,7 +198,7 @@ module Stdenv
# Sets architecture-specific flags for every environment variable # Sets architecture-specific flags for every environment variable
# given in the list `flags`. # given in the list `flags`.
# @private # @private
def set_cpu_flags(flags, map = Hardware::CPU.optimization_flags) def set_cpu_flags(flags, map = Hardware::CPU.optimization_flags) # rubocop:disable Naming/AccessorMethodName
cflags =~ /(-Xarch_#{Hardware::CPU.arch_32_bit} )-march=/ cflags =~ /(-Xarch_#{Hardware::CPU.arch_32_bit} )-march=/
xarch = Regexp.last_match(1).to_s xarch = Regexp.last_match(1).to_s
remove flags, /(-Xarch_#{Hardware::CPU.arch_32_bit} )?-march=\S*/ remove flags, /(-Xarch_#{Hardware::CPU.arch_32_bit} )?-march=\S*/
@ -213,7 +213,7 @@ module Stdenv
def x11; end def x11; end
# @private # @private
def set_cpu_cflags(map = Hardware::CPU.optimization_flags) def set_cpu_cflags(map = Hardware::CPU.optimization_flags) # rubocop:disable Naming/AccessorMethodName
set_cpu_flags CC_FLAG_VARS, map set_cpu_flags CC_FLAG_VARS, map
end end