From 1de9f3baf351392d4c50726ba2d591dfcc3c4247 Mon Sep 17 00:00:00 2001 From: "Bob W. Hogg" Date: Thu, 22 Sep 2016 17:47:50 -0400 Subject: [PATCH] make linux behaviour the default. override only for macos --- Library/Homebrew/dependency_collector.rb | 4 ++++ Library/Homebrew/extend/os/dependency_collector.rb | 2 -- Library/Homebrew/extend/os/linux/dependency_collector.rb | 5 ----- 3 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 Library/Homebrew/extend/os/linux/dependency_collector.rb diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index f83e7adf3e..ef3a712e96 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -135,6 +135,10 @@ class DependencyCollector end end + def ant_dep(spec, tags) + Dependency.new(spec.to_s, tags) + end + def resource_dep(spec, tags) tags << :build strategy = spec.download_strategy diff --git a/Library/Homebrew/extend/os/dependency_collector.rb b/Library/Homebrew/extend/os/dependency_collector.rb index 83e9e2b61e..d295263f62 100644 --- a/Library/Homebrew/extend/os/dependency_collector.rb +++ b/Library/Homebrew/extend/os/dependency_collector.rb @@ -2,6 +2,4 @@ require "dependency_collector" if OS.mac? require "extend/os/mac/dependency_collector" -elsif OS.linux? - require "extend/os/linux/dependency_collector" end diff --git a/Library/Homebrew/extend/os/linux/dependency_collector.rb b/Library/Homebrew/extend/os/linux/dependency_collector.rb deleted file mode 100644 index 37758c307a..0000000000 --- a/Library/Homebrew/extend/os/linux/dependency_collector.rb +++ /dev/null @@ -1,5 +0,0 @@ -class DependencyCollector - def ant_dep(spec, tags) - Dependency.new(spec.to_s, tags) - end -end