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

stdenv: stop setting LD

Browse Source 
superenv stopped setting LD in
8e4c0a141171666270529da4be026d529d474467, seems sensible to follow
suit in stdenv too.

See Homebrew/homebrew#14943.

Fixes Homebrew/homebrew#15090.
This commit is contained in:
Misty De Meo 2012-09-26 12:57:04 -05:00
parent b4e246e75d
commit 3633995fc9
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,12 +48,6 @@ module HomebrewEnvExtension
self['OBJC'] = self['CC']
end
# In rare cases this may break your builds, as the tool for some reason wants
# to use a specific linker. However doing this in general causes formula to
# build more successfully because we are changing CC and many build systems
# don't react properly to that.
self['LD'] = self['CC']
# Add lib and include etc. from the current macosxsdk to compiler flags:
macosxsdk MacOS.version
@ -119,7 +113,6 @@ module HomebrewEnvExtension
def gcc_4_0_1
# we don't use locate because gcc 4.0 has not been provided since Xcode 4
self['CC'] = "#{MacOS.dev_tools_path}/gcc-4.0"
self['LD'] = self['CC']
self['CXX'] = "#{MacOS.dev_tools_path}/g++-4.0"
self['OBJC'] = self['CC']
replace_in_cflags '-O4', '-O3'
@ -134,7 +127,6 @@ module HomebrewEnvExtension
self['CC'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1
self['CXX'] =~ %r{/usr/bin/xcrun (.*)}
self['CXX'] = `/usr/bin/xcrun -find #{$1}`.chomp if $1
self['LD'] = self['CC']
self['OBJC'] = self['CC']
end
@ -144,13 +136,11 @@ module HomebrewEnvExtension
# But we don't want LLVM of course.
self['CC'] = MacOS.locate "gcc-4.2"
self['LD'] = self['CC']
self['CXX'] = MacOS.locate "g++-4.2"
self['OBJC'] = self['CC']
unless self['CC']
self['CC'] = "#{HOMEBREW_PREFIX}/bin/gcc-4.2"
self['LD'] = self['CC']
self['CXX'] = "#{HOMEBREW_PREFIX}/bin/g++-4.2"
self['OBJC'] = self['CC']
raise "GCC could not be found" unless File.exist? self['CC']
@ -168,7 +158,6 @@ module HomebrewEnvExtension
def llvm
self['CC'] = MacOS.locate "llvm-gcc"
self['LD'] = self['CC']
self['CXX'] = MacOS.locate "llvm-g++"
self['OBJC'] = self['CC']
set_cpu_cflags 'core2 -msse4', :penryn => 'core2 -msse4.1', :core2 => 'core2', :core => 'prescott'
@ -177,7 +166,6 @@ module HomebrewEnvExtension
def clang
self['CC'] = MacOS.locate "clang"
self['LD'] = self['CC']
self['CXX'] = MacOS.locate "clang++"
self['OBJC'] = self['CC']
replace_in_cflags(/-Xarch_i386 (-march=\S*)/, '\1')