Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-31 20:51:34 +00:00
parent 43ba8d295f a629cd3f02
commit 63c7b4f9a7
701 changed files with 12952 additions and 15151 deletions
@@ -74,8 +74,8 @@ let
    preConfigure =
      ''
        configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-    '' + optionalString stdenv.isArm ''
-      configureFlagsArray=(-Dldflags="-lm -lrt")
+      '' + optionalString (stdenv.isArm || stdenv.isMips) ''
+        configureFlagsArray=(-Dldflags="-lm -lrt")
      '' + optionalString stdenv.isDarwin ''
        substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
      '' + optionalString (!enableThreading) ''