aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-08-02 20:09:42 -0500
committerJack Nagel2014-08-02 20:11:04 -0500
commit3597c0d13ed956bc6ba75eb97f12928065c4a14c (patch)
treeace63eef61414c13e6921a396cb79d0cf4d3fdaf
parentd2f4f224a76f1dad5f6fbae2953078dbff5c9a31 (diff)
downloadhomebrew-3597c0d13ed956bc6ba75eb97f12928065c4a14c.tar.bz2
Simplify compatibility logic
-rw-r--r--Library/Homebrew/cxxstdlib.rb10
1 files changed, 2 insertions, 8 deletions
diff --git a/Library/Homebrew/cxxstdlib.rb b/Library/Homebrew/cxxstdlib.rb
index 34ce92d99..3326ebac0 100644
--- a/Library/Homebrew/cxxstdlib.rb
+++ b/Library/Homebrew/cxxstdlib.rb
@@ -27,14 +27,8 @@ class CxxStdlib
return false unless type == other.type
- if apple_compiler?
- return false unless other.apple_compiler?
- else
- return false if other.apple_compiler?
- return false unless compiler.to_s[4..6] == other.compiler.to_s[4..6]
- end
-
- true
+ apple_compiler? && other.apple_compiler? ||
+ !other.apple_compiler? && compiler.to_s[4..6] == other.compiler.to_s[4..6]
end
def check_dependencies(formula, deps)