Merge remote-tracking branch 'upstream/gcc-8' into staging-next

Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
parent ccc8c73ea0 e7297363c9
commit 5f4734b1dd
70 changed files with 275 additions and 659 deletions
@@ -32,6 +32,8 @@ in stdenv.mkDerivation rec {
  buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ]
    ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];

+  NIX_CFLAGS_COMPILE = [ "-Wno-error=class-memaccess" ];
+
  prePatch = lib.optional stdenv.isDarwin ''
    substituteInPlace Make.rules.Darwin \
        --replace xcrun ""
@@ -1,9 +0,0 @@
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -77,4 +77,6 @@ FreezeScript: Freeze
- Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib
- 
-+Glacier2: IceSSL
-+
- IcePatch2: IcePatch2Lib
-