diff options
| author | Mike McQuaid | 2018-01-03 21:12:59 +0000 |
|---|---|---|
| committer | GitHub | 2018-01-03 21:12:59 +0000 |
| commit | b9cb6ccca82a7b8d26cdd0f665c730a6024b78aa (patch) | |
| tree | c7c35175a500462a2394701ab567df37e27f7132 | |
| parent | 4e08da95c34c27ba6d5ca5f80718fe2788337cdf (diff) | |
| parent | 5d9149a4b9fec1a70df69dff05d9e6b117629467 (diff) | |
| download | brew-b9cb6ccca82a7b8d26cdd0f665c730a6024b78aa.tar.bz2 | |
Merge pull request #3626 from sjackman/ld64
LD64Dependency is needed on macOS only
| -rw-r--r-- | Library/Homebrew/dependency_collector.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/extend/os/mac/dependency_collector.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/os/mac/ld64_dependency.rb (renamed from Library/Homebrew/ld64_dependency.rb) | 0 |
3 files changed, 3 insertions, 4 deletions
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index 3164d237e..9ad93c268 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 03534bab9..d25d90261 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 index a506a0ab2..a506a0ab2 100644 --- a/Library/Homebrew/ld64_dependency.rb +++ b/Library/Homebrew/os/mac/ld64_dependency.rb |