From 5d9149a4b9fec1a70df69dff05d9e6b117629467 Mon Sep 17 00:00:00 2001
From: Shaun Jackman
Date: Wed, 3 Jan 2018 10:51:06 -0800
Subject: 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/ld64_dependency.rb                    | 11 -----------
 Library/Homebrew/os/mac/ld64_dependency.rb             | 11 +++++++++++
 4 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 Library/Homebrew/ld64_dependency.rb
 create mode 100644 Library/Homebrew/os/mac/ld64_dependency.rb

(limited to 'Library')

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/ld64_dependency.rb
deleted file mode 100644
index a506a0ab2..000000000
--- a/Library/Homebrew/ld64_dependency.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require "dependency"
-
-# This special dependency ensures that the Tigerbrew ld64
-# formula is used as gcc's ld in place of the old version
-# that comes with the OS.
-class LD64Dependency < Dependency
-  def initialize(name = "ld64", tags = [:build], env_proc = nil)
-    super
-    @env_proc = proc { ENV.ld64 }
-  end
-end
diff --git a/Library/Homebrew/os/mac/ld64_dependency.rb b/Library/Homebrew/os/mac/ld64_dependency.rb
new file mode 100644
index 000000000..a506a0ab2
--- /dev/null
+++ b/Library/Homebrew/os/mac/ld64_dependency.rb
@@ -0,0 +1,11 @@
+require "dependency"
+
+# This special dependency ensures that the Tigerbrew ld64
+# formula is used as gcc's ld in place of the old version
+# that comes with the OS.
+class LD64Dependency < Dependency
+  def initialize(name = "ld64", tags = [:build], env_proc = nil)
+    super
+    @env_proc = proc { ENV.ld64 }
+  end
+end
-- 
cgit v1.2.3