diff options
| -rw-r--r-- | Library/Homebrew/compat/formula.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/Library/Homebrew/compat/formula.rb b/Library/Homebrew/compat/formula.rb index 11f65e36d..40469da33 100644 --- a/Library/Homebrew/compat/formula.rb +++ b/Library/Homebrew/compat/formula.rb @@ -16,10 +16,6 @@ class Formula "-DCMAKE_INSTALL_PREFIX='#{prefix}' -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev" end - def cxxstdlib - self.class.cxxstdlib - end - def cxxstdlib_check check_type self.class.cxxstdlib_check check_type end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 2774f23ca..852e85b80 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -245,7 +245,7 @@ class Formula end def skip_cxxstdlib_check? - self.class.cxxstdlib.include?(:skip) + false end def require_universal_deps? @@ -712,16 +712,9 @@ class Formula @keg_only_reason = KegOnlyReason.new(reason, explanation) end - # Flag for marking whether this formula needs C++ standard library - # compatibility check - def cxxstdlib - @cxxstdlib ||= Set.new - end - - # Explicitly request changing C++ standard library compatibility check - # settings. Use with caution! + # Pass :skip to this method to disable post-install stdlib checking def cxxstdlib_check check_type - cxxstdlib << check_type + define_method(:skip_cxxstdlib_check?) { true } if check_type == :skip end # For Apple compilers, this should be in the format: |