aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob W. Hogg2016-09-22 17:47:50 -0400
committerBob W. Hogg2016-09-22 17:47:50 -0400
commit1de9f3baf351392d4c50726ba2d591dfcc3c4247 (patch)
tree698549018efddf2e7582d454479a1d8c712dd3e5
parent0029ad2929d1ece249047b381299e63ba9b858fa (diff)
downloadbrew-1de9f3baf351392d4c50726ba2d591dfcc3c4247.tar.bz2
make linux behaviour the default. override only for macos
-rw-r--r--Library/Homebrew/dependency_collector.rb4
-rw-r--r--Library/Homebrew/extend/os/dependency_collector.rb2
-rw-r--r--Library/Homebrew/extend/os/linux/dependency_collector.rb5
3 files changed, 4 insertions, 7 deletions
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index f83e7adf3..ef3a712e9 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 83e9e2b61..d295263f6 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 37758c307..000000000
--- 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