From fe16f36f3c19a29c5edfec4483d14b09cefdc175 Mon Sep 17 00:00:00 2001 From: "Tim D. Smith" Date: Wed, 10 Dec 2014 00:29:11 -0800 Subject: [PATCH] Formula#exec_cmd: recognize setuptools shim and refurbish args --- Library/Homebrew/formula.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 4dad76fdc4..36c93e7df2 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -661,8 +661,12 @@ class Formula # Turn on argument filtering in the superenv compiler wrapper. # We should probably have a better mechanism for this than adding # special cases to this method. - if cmd == "python" && %w[setup.py build.py].include?(args.first) - ENV.refurbish_args + if cmd == "python" + 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 $stdout.reopen(out)