aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2011-04-04 08:48:42 -0700
committerAdam Vandenberg2011-04-04 08:48:42 -0700
commit29ac3efe2e5615ed1c89cc51deac0f2c5d55fbfe (patch)
tree2a35b05eb067b40c639cb61abf9cd24f863129e5 /Library
parent2decef8c36e04d6066f88f5e57bb918ef129828d (diff)
downloadbrew-29ac3efe2e5615ed1c89cc51deac0f2c5d55fbfe.tar.bz2
brew doctor: update expat check
Apaprently both expat.framework and libexpat.framework exist and interfere with CMake.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/cmd/doctor.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/Library/Homebrew/cmd/doctor.rb b/Library/Homebrew/cmd/doctor.rb
index f1aae019e..570f40014 100644
--- a/Library/Homebrew/cmd/doctor.rb
+++ b/Library/Homebrew/cmd/doctor.rb
@@ -574,15 +574,17 @@ end
def check_for_other_frameworks
# Other frameworks that are known to cause problems when present
- if File.exist? "/Library/Frameworks/expat.framework"
- puts <<-EOS.undent
- /Library/Frameworks/expat.framework detected
+ ["/Library/Frameworks/expat.framework", "/Library/Frameworks/libexpat.framework"].each do |f|
+ if File.exist? f
+ puts <<-EOS.undent
+ #{f} detected
- This will be picked up by Cmake's build system and likey cause the
- build to fail, trying to link to a 32-bit version of expat.
- You may need to move this file out of the way to compile Cmake.
+ This will be picked up by Cmake's build system and likey cause the
+ build to fail, trying to link to a 32-bit version of expat.
+ You may need to move this file out of the way to compile Cmake.
- EOS
+ EOS
+ end
end
end