diff options
Diffstat (limited to 'Library/Homebrew/os')
| -rw-r--r-- | Library/Homebrew/os/mac.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/architecture_list.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/linkage_checker.rb | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb index dba2480ef..bc384da30 100644 --- a/Library/Homebrew/os/mac.rb +++ b/Library/Homebrew/os/mac.rb @@ -90,7 +90,7 @@ module OS @locator ||= SDKLocator.new begin sdk = if v.nil? - Xcode.version.to_i >= 7 ? @locator.latest_sdk : @locator.sdk_for(version) + (Xcode.version.to_i >= 7) ? @locator.latest_sdk : @locator.sdk_for(version) else @locator.sdk_for v end diff --git a/Library/Homebrew/os/mac/architecture_list.rb b/Library/Homebrew/os/mac/architecture_list.rb index 595c8f169..6f498c51f 100644 --- a/Library/Homebrew/os/mac/architecture_list.rb +++ b/Library/Homebrew/os/mac/architecture_list.rb @@ -28,12 +28,12 @@ module ArchitectureListExtension end def ppc? - (Hardware::CPU::PPC_32BIT_ARCHS+Hardware::CPU::PPC_64BIT_ARCHS).any? { |a| include? a } + (Hardware::CPU::PPC_32BIT_ARCHS + Hardware::CPU::PPC_64BIT_ARCHS).any? { |a| include? a } end # @private def remove_ppc! - (Hardware::CPU::PPC_32BIT_ARCHS+Hardware::CPU::PPC_64BIT_ARCHS).each { |a| delete a } + (Hardware::CPU::PPC_32BIT_ARCHS + Hardware::CPU::PPC_64BIT_ARCHS).each { |a| delete a } end def as_arch_flags diff --git a/Library/Homebrew/os/mac/linkage_checker.rb b/Library/Homebrew/os/mac/linkage_checker.rb index e72227fc4..6720ddcbe 100644 --- a/Library/Homebrew/os/mac/linkage_checker.rb +++ b/Library/Homebrew/os/mac/linkage_checker.rb @@ -62,10 +62,10 @@ class LinkageChecker declared_deps = formula.deps.reject { |dep| filter_out.call(dep) }.map(&:name) declared_requirement_deps = formula.requirements.reject { |req| filter_out.call(req) }.map(&:default_formula).compact declared_dep_names = (declared_deps + declared_requirement_deps).map { |dep| dep.split("/").last } - undeclared_deps = @brewed_dylibs.keys.select do |full_name| + undeclared_deps = @brewed_dylibs.keys.reject do |full_name| name = full_name.split("/").last - next false if name == formula.name - !declared_dep_names.include?(name) + next true if name == formula.name + declared_dep_names.include?(name) end undeclared_deps.sort do |a, b| if a.include?("/") && !b.include?("/") |
