aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/cleaner.rb
diff options
context:
space:
mode:
authorsamueljohn2012-02-26 21:04:15 +0100
committerAdam Vandenberg2012-06-24 19:11:06 -0700
commit3c52a3050ed64bb7cdec686eece694171752f6b9 (patch)
treea0477b44075fa17668e41bb6731afe2b20bda31e /Library/Homebrew/cleaner.rb
parentd8ac526a79675d676197568045f213764a33c1e7 (diff)
downloadhomebrew-3c52a3050ed64bb7cdec686eece694171752f6b9.tar.bz2
Core change: XCode only install, with CLT or both
Allow XCode without the Command Line Tools to work with homebrew, so it's not necessary to register an Apple Dev ID and/or go to the XCode prefs and download the CLT. Yay! Further, this commit allows to use the CLT solely (without the need for XCode). Saves quite some megs. (Some furmulae require xcodebuild) Of course XCode together with the CLT is still fine and has been tested on 10.7 and 10.6 with Xcode 4 and Xcode 3. Only on Lion or above, tell the user about the options, which are - Xcode without CLT - CLT without Xcode - both (ok, it's not directly stated, but implicit) So if no Xcode is found and we are on Lion or above, we don't fail but check for the CLTs now. For older Macs, the old message that Xcode is needed and the installer should be run is still displayed. If the CLT are not found but Xcode is, then we print out about the experimental status of this setup. Closes #10510. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Homebrew/cleaner.rb')
-rw-r--r--Library/Homebrew/cleaner.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cleaner.rb b/Library/Homebrew/cleaner.rb
index 3950cd846..b7e30c06f 100644
--- a/Library/Homebrew/cleaner.rb
+++ b/Library/Homebrew/cleaner.rb
@@ -37,7 +37,7 @@ class Cleaner
puts "strip #{path}" if ARGV.verbose?
path.chmod 0644 # so we can strip
unless path.stat.nlink > 1
- system "/usr/bin/strip", *(args+path)
+ system "#{MacOS.locate('strip')}", *(args+path)
else
path = path.to_s.gsub ' ', '\\ '
@@ -45,7 +45,7 @@ class Cleaner
# is this expected behaviour? patch does it too… still, this fixes it
tmp = `/usr/bin/mktemp -t homebrew_strip`.chomp
begin
- `/usr/bin/strip #{args} -o #{tmp} #{path}`
+ `#{MacOS.locate('strip')} #{args} -o #{tmp} #{path}`
`/bin/cat #{tmp} > #{path}`
ensure
FileUtils.rm tmp