Merge pull request #7817 from gridaphobe/cc-wrapper-isgnu-isclang

Add isGNU and isClang attributes to cc-wrapper
2015-05-14 10:09:07 -07:00
parent 221c45d51f 662a6b1ca6
commit 67fe5d46d4
30 changed files with 42 additions and 32 deletions
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  # ./configure time check for any of this.
  buildInputs = [ libevent openssl zlib torsocks ];

-  CFLAGS = stdenv.lib.optionalString (stdenv.cc.cc.isGNU or false) "-lgcc_s";
+  CFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";

  # Patch 'torify' to point directly to torsocks.
  patchPhase = ''