Ensure HOMEBREW_ARCHFLAGS is always a string

This commit is contained in:
Jack Nagel 2014-05-10 16:54:30 -05:00
parent 98f9b2d4ea
commit 5f94742afb
2 changed files with 2 additions and 5 deletions

View File

@ -233,9 +233,7 @@ class Cmd
end
def archflags
args = []
args.concat ENV['HOMEBREW_ARCHFLAGS'].split(' ') if cccfg? 'u'
args
ENV["HOMEBREW_ARCHFLAGS"].split(" ")
end
def syspath

View File

@ -76,6 +76,7 @@ module Superenv
self['HOMEBREW_TEMP'] = HOMEBREW_TEMP
self['HOMEBREW_SDKROOT'] = "#{MacOS.sdk_path}" if MacOS::Xcode.without_clt?
self['HOMEBREW_OPTFLAGS'] = determine_optflags
self['HOMEBREW_ARCHFLAGS'] = ''
self['CMAKE_PREFIX_PATH'] = determine_cmake_prefix_path
self['CMAKE_FRAMEWORK_PATH'] = determine_cmake_frameworks_path
self['CMAKE_INCLUDE_PATH'] = determine_cmake_include_path
@ -91,7 +92,6 @@ module Superenv
# compiler flag stripping. It consists of a string of characters which act
# as flags. Some of these flags are mutually exclusive.
#
# u - A universal build was requested
# 3 - A 32-bit build was requested
# O - Enables argument refurbishing. Only active under the
# make/bsdmake wrappers currently.
@ -258,7 +258,6 @@ module Superenv
def universal_binary
self['HOMEBREW_ARCHFLAGS'] = Hardware::CPU.universal_archs.as_arch_flags
append 'HOMEBREW_CCCFG', "u", ''
# GCC doesn't accept "-march" for a 32-bit CPU with "-arch x86_64"
if compiler != :clang && Hardware.is_32_bit?