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

Formula#exec_cmd: recognize setuptools shim and refurbish args

Browse Source
This commit is contained in:
Tim D. Smith 2014-12-10 00:29:11 -08:00
parent 99848607b2
commit fe16f36f3c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/formula.rb
View File

@ -661,8 +661,12 @@ class Formula
# Turn on argument filtering in the superenv compiler wrapper. # Turn on argument filtering in the superenv compiler wrapper.
# We should probably have a better mechanism for this than adding # We should probably have a better mechanism for this than adding
# special cases to this method. # special cases to this method.
if cmd == "python" && %w[setup.py build.py].include?(args.first) if cmd == "python"
ENV.refurbish_args setup_py_in_args = %w[setup.py build.py].include?(args.first)
setuptools_shim_in_args = args.any? { |a| a.start_with? "import setuptools" }
if setup_py_in_args || setuptools_shim_in_args
ENV.refurbish_args
end
end end
$stdout.reopen(out) $stdout.reopen(out)