use more env helpers

5 files changed, 6 insertions, 6 deletions

diff --git a/Library/Formula/bind.rb b/Library/Formula/bind.rb
index 624fc5add..d17c015c6 100644
--- a/Library/Formula/bind.rb
+++ b/Library/Formula/bind.rb
@@ -11,7 +11,7 @@ class Bind < Formula
   def install
     ENV.libxml2
     # libxml2 appends one inc dir to CPPFLAGS but bind ignores CPPFLAGS
-    ENV.append 'CFLAGS', ENV['CPPFLAGS']
+    ENV.append 'CFLAGS', ENV.cppflags
 
     ENV['STD_CDEFINES'] = '-DDIG_SIGCHASE=1'
 
diff --git a/Library/Formula/exim.rb b/Library/Formula/exim.rb
index b747258dc..3dfb3f46d 100644
--- a/Library/Formula/exim.rb
+++ b/Library/Formula/exim.rb
@@ -39,7 +39,7 @@ class Exim < Formula
     end
 
     # The compile script ignores CPPFLAGS
-    ENV.append "CFLAGS", ENV['CPPFLAGS']
+    ENV.append 'CFLAGS', ENV.cppflags
 
     ENV.j1 # See: https://lists.exim.org/lurker/thread/20111109.083524.87c96d9b.en.html
     system "make"
diff --git a/Library/Formula/nu.rb b/Library/Formula/nu.rb
index 801f5aabe..d4ae3ac90 100644
--- a/Library/Formula/nu.rb
+++ b/Library/Formula/nu.rb
@@ -24,7 +24,7 @@ class Nu < Formula
 
     inreplace "Makefile" do |s|
       cflags = s.get_make_var "CFLAGS"
-      s.change_make_var! "CFLAGS", "#{cflags} #{ENV["CPPFLAGS"]}"
+      s.change_make_var! "CFLAGS", "#{cflags} #{ENV.cppflags}"
       # nu hardcodes its compiler paths to a location which no longer works
       # This should work for both Xcode-only and CLT-only systems
       s.gsub! "$(DEVROOT)/usr/bin/clang", ENV.cc
diff --git a/Library/Formula/pianobar.rb b/Library/Formula/pianobar.rb
index 6caaa1038..5135e1105 100644
--- a/Library/Formula/pianobar.rb
+++ b/Library/Formula/pianobar.rb
@@ -26,7 +26,7 @@ class Pianobar < Formula
                     # Or it doesn't build at all
                     "-std=c99 " +
                     # build if we aren't /usr/local'
-                    "#{ENV["CPPFLAGS"]} #{ENV["LDFLAGS"]}"
+                    "#{ENV.cppflags} #{ENV.ldflags}"
 
     system "make", "PREFIX=#{prefix}"
     system "make", "install", "PREFIX=#{prefix}"
diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb
index 2216fbae1..e22401db9 100644
--- a/Library/Formula/swi-prolog.rb
+++ b/Library/Formula/swi-prolog.rb
@@ -44,8 +44,8 @@ class SwiProlog < Formula
     # SWI-Prolog's Makefiles don't add CPPFLAGS to the compile command, but do
     # include CIFLAGS. Setting it here. Also, they clobber CFLAGS, so including
     # the Homebrew-generated CFLAGS into COFLAGS here.
-    ENV['CIFLAGS'] = ENV['CPPFLAGS']
-    ENV['COFLAGS'] = ENV['CFLAGS']
+    ENV['CIFLAGS'] = ENV.cppflags
+    ENV['COFLAGS'] = ENV.cflags
 
     # Build the packages unless --lite option specified
     args << "--with-world" unless build.include? "lite"