Fix superenv libgcrypt

This started happening because I undefined CC. Now a lot of tools pick gcc. The problem here is that we add to cflags before configure, and during configure we are 'servile' so when configure uses gcc it *is* llvm-gcc and not clang, which we will be during make because then we are *not* servile.

So we have to assign these cflags during make only, which is easy enough. Code is neater now too.

I am now working on superenv so that it can determine if a tool cannot use certain flags and then pick another. The last stage of always-just-works.

1 files changed, 7 insertions, 6 deletions

diff --git a/Library/Formula/libgcrypt.rb b/Library/Formula/libgcrypt.rb
index bf5c50a95..18c7a88e4 100644
--- a/Library/Formula/libgcrypt.rb
+++ b/Library/Formula/libgcrypt.rb
@@ -14,20 +14,21 @@ class Libgcrypt < Formula
     end
   end
 
+  def cflags
+    cflags = "#{ENV['CFLAGS']}"
+    cflags += '-std=gnu89 -fheinous-gnu-extensions' if ENV.compiler == :clang
+    cflags  
+  end
+
   def install
     ENV.universal_binary # build fat so wine can use it
 
-    if ENV.compiler == :clang
-      ENV.append 'CFLAGS', '-std=gnu89'
-      ENV.append 'CFLAGS', '-fheinous-gnu-extensions'
-    end
-
     system "./configure", "--disable-dependency-tracking",
                           "--prefix=#{prefix}",
                           "--disable-asm",
                           "--with-gpg-error-prefix=#{HOMEBREW_PREFIX}"
     # Parallel builds work, but only when run as separate steps
-    system "make"
+    system "make", "CFLAGS=#{cflags}"
     system "make check"
     system "make install"
   end