diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2018-05-16 03:09:33 +0300 |
| commit | 6b6a57574828b21632a7b8ff3a99e1465035b93e (patch) | |
| tree | 07fe10e97c2d0b4cbf45e90952d8c7d948e84c59 /pkgs/development/compilers/gcc/7 | |
| parent | ce018be2d6ce20960b52ebc4bd86e64a5a58ce29 (diff) | |
| parent | 780592ca6ef752f3f4886a66ed6181095e358db5 (diff) | |
| download | nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.gz nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.bz2 nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.lz nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.xz nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.tar.zst nixlib-6b6a57574828b21632a7b8ff3a99e1465035b93e.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/tools/networking/telnet/default.nix pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/development/compilers/gcc/7')
| -rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 8137ca30ec2b..fab9b8fe7458 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -325,6 +325,7 @@ stdenv.mkDerivation ({ "--with-gnu-as" "--without-gnu-ld" ] ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer" + ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419" ; targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null; |