diff options
| author | Misty De Meo | 2014-01-20 10:04:27 -0800 |
|---|---|---|
| committer | Misty De Meo | 2014-02-02 11:04:30 -0800 |
| commit | 3d82b7303c97668272e7fa2f95771f242ecf203e (patch) | |
| tree | 2975f54908b6156a9078bcff4c410f020c1a95b8 /Library/Homebrew/keg_fix_install_names.rb | |
| parent | ab82145230f8448926d2617bd30ad53a004d420d (diff) | |
| download | homebrew-3d82b7303c97668272e7fa2f95771f242ecf203e.tar.bz2 | |
C++ stdlib check: don't check executables for deps
This avoids some possible false positives, as happens with, e.g., qt4.
Diffstat (limited to 'Library/Homebrew/keg_fix_install_names.rb')
| -rw-r--r-- | Library/Homebrew/keg_fix_install_names.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Library/Homebrew/keg_fix_install_names.rb b/Library/Homebrew/keg_fix_install_names.rb index 3fc827bf5..cdbab97a9 100644 --- a/Library/Homebrew/keg_fix_install_names.rb +++ b/Library/Homebrew/keg_fix_install_names.rb @@ -66,10 +66,11 @@ class Keg # lib/, and ignores binaries and other mach-o objects # Note that this doesn't attempt to distinguish between libstdc++ versions, # for instance between Apple libstdc++ and GNU libstdc++ - def detect_cxx_stdlibs + def detect_cxx_stdlibs(opts={:skip_executables => false}) results = Set.new mach_o_files.each do |file| + next if file.mach_o_executable? && opts[:skip_executables] dylibs = file.dynamically_linked_libraries results << :libcxx unless dylibs.grep(/libc\+\+.+\.dylib/).empty? results << :libstdcxx unless dylibs.grep(/libstdc\+\+.+\.dylib/).empty? |