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

ENV.rb: Set flags for Objective-C

Browse Source 
We set defaults for C and C++, might as well do the same for Objective-C and
Objective-C++.

Closes Homebrew/homebrew#10354.
This commit is contained in:
Charlie Sharpsteen 2012-02-20 13:16:58 -08:00
parent c34cdbbeb9
commit c0299ad19b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Library/Homebrew/extend/ENV.rb
View File

@ -20,7 +20,7 @@ module HomebrewEnvExtension
end end
# Os is the default Apple uses for all its stuff so let's trust them # Os is the default Apple uses for all its stuff so let's trust them
self['CFLAGS'] = self['CXXFLAGS'] = "-Os #{SAFE_CFLAGS_FLAGS}" set_cflags "-Os #{SAFE_CFLAGS_FLAGS}"
# set us up for the user's compiler choice # set us up for the user's compiler choice
self.send self.compiler self.send self.compiler
@ -315,6 +315,8 @@ Please take one of the following actions:
def append_to_cflags f def append_to_cflags f
append 'CFLAGS', f append 'CFLAGS', f
append 'CXXFLAGS', f append 'CXXFLAGS', f
append 'OBJCFLAGS', f
append 'OBJCXXFLAGS', f
end end
def remove key, value def remove key, value
@ -326,14 +328,23 @@ Please take one of the following actions:
def remove_from_cflags f def remove_from_cflags f
remove 'CFLAGS', f remove 'CFLAGS', f
remove 'CXXFLAGS', f remove 'CXXFLAGS', f
remove 'OBJCFLAGS', f
remove 'OBJCXXFLAGS', f
end end
def replace_in_cflags before, after def replace_in_cflags before, after
%w{CFLAGS CXXFLAGS}.each do |key| %w{CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS}.each do |key|
self[key] = self[key].sub before, after if self[key] self[key] = self[key].sub before, after if self[key]
end end
end end
# Convenience method to set all C compiler flags in one shot.
def set_cflags f
%w{CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS}.each do |key|
self[key] = f
end
end
def set_cpu_cflags default, map = {} def set_cpu_cflags default, map = {}
cflags =~ %r{(-Xarch_i386 )-march=} cflags =~ %r{(-Xarch_i386 )-march=}
xarch = $1.to_s xarch = $1.to_s
@ -389,7 +400,7 @@ Please take one of the following actions:
end end
def remove_cc_etc def remove_cc_etc
keys = %w{CC CXX LD CPP CFLAGS CXXFLAGS LDFLAGS CPPFLAGS} keys = %w{CC CXX LD CPP CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS LDFLAGS CPPFLAGS}
removed = Hash[*keys.map{ |key| [key, ENV[key]] }.flatten] removed = Hash[*keys.map{ |key| [key, ENV[key]] }.flatten]
keys.each do |key| keys.each do |key|
ENV[key] = nil ENV[key] = nil