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

superenv: add LDFLAGS if disabling weak imports.

Browse Source
This commit is contained in:
Mike McQuaid 2016-08-16 13:48:21 +01:00
parent 53d1000739
commit 5609183567
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/extend/os/mac/extend/ENV/super.rb
View File

@ -81,6 +81,10 @@ module Superenv
s << "s" if MacOS.version >= :mountain_lion s << "s" if MacOS.version >= :mountain_lion
# Fix issue with >= 10.8 apr-1-config having broken paths # Fix issue with >= 10.8 apr-1-config having broken paths
s << "a" if MacOS.version >= :mountain_lion s << "a" if MacOS.version >= :mountain_lion
# Xcode 8 should be told to fail to link against weak links
# Issue from Apple engineer:
# https://github.com/Homebrew/homebrew-core/issues/3727
s << "w" if no_weak_imports?
s s
end end

6
Library/Homebrew/shims/super/cc
View File

@ -258,8 +258,10 @@ class Cmd
case mode case mode
when :ld when :ld
args << "-headerpad_max_install_names" args << "-headerpad_max_install_names"
args << "-no_weak_imports" if no_weak_imports?
when :ccld, :cxxld when :ccld, :cxxld
args << "-Wl,-headerpad_max_install_names" args << "-Wl,-headerpad_max_install_names"
args << "-Wl,-no_weak_imports" if no_weak_imports?
end end
args args
end end
@ -305,6 +307,10 @@ class Cmd
config.include?("K") config.include?("K")
end end
def no_weak_imports?
config.include?("w")
end
def canonical_path(path) def canonical_path(path)
path = Pathname.new(path) path = Pathname.new(path)
path = path.realpath if path.exist? path = path.realpath if path.exist?