From 5d9149a4b9fec1a70df69dff05d9e6b117629467 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Wed, 3 Jan 2018 10:51:06 -0800 Subject: [PATCH] LD64Dependency is needed on macOS only Move ld64_dependency.rb to os/mac/. --- Library/Homebrew/dependency_collector.rb | 5 +---- Library/Homebrew/extend/os/mac/dependency_collector.rb | 2 ++ Library/Homebrew/{ => os/mac}/ld64_dependency.rb | 0 3 files changed, 3 insertions(+), 4 deletions(-) rename Library/Homebrew/{ => os/mac}/ld64_dependency.rb (100%) diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index 3164d237e1..9ad93c268e 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -1,6 +1,5 @@ require "dependency" require "dependencies" -require "ld64_dependency" require "requirement" require "requirements" require "set" @@ -61,9 +60,7 @@ class DependencyCollector Dependency.new("xz", tags) end - def ld64_dep_if_needed(*) - LD64Dependency.new - end + def ld64_dep_if_needed(*); end def self.tar_needs_xz_dependency? !new.xz_dep_if_needed([]).nil? diff --git a/Library/Homebrew/extend/os/mac/dependency_collector.rb b/Library/Homebrew/extend/os/mac/dependency_collector.rb index 03534bab96..d25d902614 100644 --- a/Library/Homebrew/extend/os/mac/dependency_collector.rb +++ b/Library/Homebrew/extend/os/mac/dependency_collector.rb @@ -1,3 +1,5 @@ +require "os/mac/ld64_dependency" + class DependencyCollector def cvs_dep_if_needed(tags) return if MacOS.version < :lion diff --git a/Library/Homebrew/ld64_dependency.rb b/Library/Homebrew/os/mac/ld64_dependency.rb similarity index 100% rename from Library/Homebrew/ld64_dependency.rb rename to Library/Homebrew/os/mac/ld64_dependency.rb