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

This commit is contained in:
John Ericson
2019-11-10 16:11:57 -05:00
4941 changed files with 151742 additions and 85786 deletions

View File

@@ -6,6 +6,7 @@
, profiledCompiler ? false
, staticCompiler ? false
, enableShared ? true
, enableLTO ? true
, texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man)
, gmp, mpfr, libmpc, gettext, which
@@ -120,7 +121,12 @@ stdenv.mkDerivation ({
sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
''
)
else "");
else "")
+ stdenv.lib.optionalString targetPlatform.isAvr ''
makeFlagsArray+=(
'LIMITS_H_TEST=false'
)
'';
inherit noSysDirs staticCompiler crossStageStatic
libcCross crossMingw;
@@ -168,8 +174,9 @@ stdenv.mkDerivation ({
gmp mpfr libmpc libelf isl
enablePlugin
enableLTO
enableMultilib
enablePlugin
enableShared
langC
@@ -263,9 +270,6 @@ stdenv.mkDerivation ({
stdenv.lib.platforms.freebsd ++
stdenv.lib.platforms.illumos ++
stdenv.lib.platforms.darwin;
# See #40038
broken = stdenv.isDarwin;
};
}