rsyslog: simplify environment setup

This builds and runs correctly, universal and otherwise, without
changing the compiler environment variables manually.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/Library/Formula/rsyslog.rb b/Library/Formula/rsyslog.rb
index 03bf1eae9..ae7e42246 100644
--- a/Library/Formula/rsyslog.rb
+++ b/Library/Formula/rsyslog.rb
@@ -12,16 +12,8 @@ class Rsyslog < Formula
   end
 
   def install
-    if ARGV.build_universal?
-      ENV['CC'] = "gcc -arch i386 -arch x86_64"
-      ENV['CXX'] = "g++ -arch i386 -arch x86_64"
-      ENV['CPP'] = "gcc -E"
-      ENV['CXXCPP'] = "g++ -E"
-      system "./configure", "--prefix=#{prefix}"
-    else
-      system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
-    end
-
+    ENV.universal_binary if ARGV.build_universal?
+    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
     system "make"
     system "make install"
   end