Goodbye -fheinous-gnu-extensions!

2 files changed, 2 insertions, 10 deletions

diff --git a/Library/Formula/gnupg.rb b/Library/Formula/gnupg.rb
index 62653f0a8..90557780a 100644
--- a/Library/Formula/gnupg.rb
+++ b/Library/Formula/gnupg.rb
@@ -16,7 +16,6 @@ class Gnupg < Formula
 
   def install
     inreplace 'g10/keygen.c', 'max=4096', 'max=8192' if build.include? '8192'
-    ENV.append "CFLAGS", "-std=gnu89 -fheinous-gnu-extensions" if ENV.compiler == :clang
 
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
diff --git a/Library/Formula/libgcrypt.rb b/Library/Formula/libgcrypt.rb
index 1c063695e..a2ffea357 100644
--- a/Library/Formula/libgcrypt.rb
+++ b/Library/Formula/libgcrypt.rb
@@ -22,20 +22,13 @@ class Libgcrypt < Formula
     sha1 '136f636673b5c9d040f8a55f59b430b0f1c97d7a'
   end if build.universal?
 
-  fails_with :clang do
-    build 77
-    cause "basic test fails"
-  end
-
   def install
     ENV.universal_binary if build.universal?
 
-    ENV.append 'CFLAGS', '-std=gnu89 -fheinous-gnu-extensions' if ENV.compiler == :clang
-
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-asm",
-                          "--with-gpg-error-prefix=#{HOMEBREW_PREFIX}"
+                          "--with-gpg-error-prefix=#{Formula["libgpg-error"].opt_prefix}"
 
     if build.universal?
       buildpath.install resource('config.h.ed')
@@ -43,7 +36,7 @@ class Libgcrypt < Formula
     end
 
     # Parallel builds work, but only when run as separate steps
-    system "make", "CFLAGS=#{ENV.cflags}"
+    system "make"
     system "make check"
     system "make install"
   end