Merge remote-tracking branch 'upstream/master' into gcc-dedup-configure-flags

2019-11-10 16:11:57 -05:00
parent 5c5ca018c8 84c44d8caf
commit 62e154ff8d
4941 changed files with 151742 additions and 85786 deletions
--- a/pkgs/development/compilers/gcc/common/configure-flags.nix
+++ b/pkgs/development/compilers/gcc/common/configure-flags.nix
@@ -7,8 +7,9 @@
 , gmp, mpfr, libmpc, libelf, isl
 , cloog ? null

-, enablePlugin
+, enableLTO
 , enableMultilib
+, enablePlugin
 , enableShared

 , langC
@@ -103,7 +104,7 @@ let

    # Basic configuration
    ++ [
-      "--enable-lto"
+      (lib.enableFeature enableLTO "lto")
      "--disable-libstdcxx-pch"
      "--without-included-gettext"
      "--with-system-zlib"