diff options
| author | Jack Nagel | 2014-05-01 18:36:46 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-05-01 18:36:46 -0500 |
| commit | 71055aa073dc7583f0f4b6267f0663088d8f28d1 (patch) | |
| tree | 58c6f2800be0fede365d83d54056985158e44f38 /Library/Homebrew/extend | |
| parent | 564b5df2614c112103766202bcea644ab6851d3a (diff) | |
| download | brew-71055aa073dc7583f0f4b6267f0663088d8f28d1.tar.bz2 | |
Move xctoolchain_path to Xcode module, where it belongs
Diffstat (limited to 'Library/Homebrew/extend')
| -rw-r--r-- | Library/Homebrew/extend/ENV/std.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/extend/ENV/super.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/ENV/std.rb b/Library/Homebrew/extend/ENV/std.rb index fb2741b53..663be4ff0 100644 --- a/Library/Homebrew/extend/ENV/std.rb +++ b/Library/Homebrew/extend/ENV/std.rb @@ -71,9 +71,7 @@ module Stdenv macosxsdk MacOS.version if MacOS::Xcode.without_clt? - # Some tools (clang, etc.) are in the xctoolchain dir of Xcode - append_path 'PATH', "#{MacOS.xctoolchain_path}/usr/bin" if MacOS.xctoolchain_path - # Others are now at /Applications/Xcode.app/Contents/Developer/usr/bin + append_path "PATH", "#{MacOS::Xcode.toolchain_path}/usr/bin" append_path 'PATH', MacOS.dev_tools_path end end diff --git a/Library/Homebrew/extend/ENV/super.rb b/Library/Homebrew/extend/ENV/super.rb index 940cc36d2..76d26836b 100644 --- a/Library/Homebrew/extend/ENV/super.rb +++ b/Library/Homebrew/extend/ENV/super.rb @@ -117,7 +117,7 @@ module Superenv paths = [Superenv.bin] if MacOS::Xcode.without_clt? paths << "#{MacOS::Xcode.prefix}/usr/bin" - paths << "#{MacOS::Xcode.prefix}/Toolchains/XcodeDefault.xctoolchain/usr/bin" + paths << "#{MacOS::Xcode.toolchain_path}/usr/bin" end paths += deps.map{|dep| "#{HOMEBREW_PREFIX}/opt/#{dep}/bin" } paths << MacOS::X11.bin if x11? |