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

2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
@@ -21,6 +21,8 @@ stdenv.mkDerivation {
  # not possible due to assembler code
  hardeningDisable = [ "pic" "stackprotector" ];

+  NIX_CFLAGS_COMPILE = "-Wno-error";
+
  makeFlags =
    [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
      "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"