From 709674cb95f80ca8fb71c39a53e6fb74bcc2782f Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 3 Feb 2012 15:02:35 -0600 Subject: [PATCH] Move old ENV.use_foo? compiler methods to compat Signed-off-by: Jack Nagel --- Library/Homebrew/compat/compatibility.rb | 14 ++++++++++++++ Library/Homebrew/extend/ENV.rb | 12 ------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/compat/compatibility.rb b/Library/Homebrew/compat/compatibility.rb index ac94feff8e..ab3377e888 100644 --- a/Library/Homebrew/compat/compatibility.rb +++ b/Library/Homebrew/compat/compatibility.rb @@ -80,3 +80,17 @@ end class UnidentifiedFormula < Formula end + +module HomebrewEnvExtension extend self + def use_clang? + compiler == :clang + end + + def use_gcc? + compiler == :gcc + end + + def use_llvm? + compiler == :llvm + end +end diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb index c02071c09f..2ea1127c10 100644 --- a/Library/Homebrew/extend/ENV.rb +++ b/Library/Homebrew/extend/ENV.rb @@ -320,18 +320,6 @@ Please take one of the following actions: end end - # don't use in new code - # don't remove though, but do add to compatibility.rb - def use_clang? - compiler == :clang - end - def use_gcc? - compiler == :gcc - end - def use_llvm? - compiler == :llvm - end - def make_jobs # '-j' requires a positive integral argument if self['HOMEBREW_MAKE_JOBS'].to_i > 0