diff options
| author | Dima <dgoldin+github@protonmail.ch> | 2019-10-07 00:25:04 +0200 |
|---|---|---|
| committer | Dima <dgoldin+github@protonmail.ch> | 2019-10-07 04:12:26 +0200 |
| commit | 3bfe0872b9627264482da2bc0a10d3b1b80c2a0a (patch) | |
| tree | 1078335ee041d96a4f8f31ca5d593e07b6283433 /pkgs/development/libraries/qt-5/modules | |
| parent | 0ce30f8c67db15ae312f1e27f9228468bbdbb528 (diff) | |
qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang
With a previous fix for log size issues due to GCC 8 a gcc specific `-W` flag was added that clang does not know, so it spams the logs.
Diffstat (limited to 'pkgs/development/libraries/qt-5/modules')
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index c96aef3f4da55..df444eee2eb56 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -103,7 +103,7 @@ EOF --replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' ''); - NIX_CFLAGS_COMPILE = [ + NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [ # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit "-Wno-class-memaccess" ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 78404ddffa876..542afdd55da02 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -50,13 +50,12 @@ qtModule { export qmakeFlags="$qmakeFlags CONFIG+=silent" ''; - NIX_CFLAGS_COMPILE = - [ + NIX_CFLAGS_COMPILE = [ # with gcc7 this warning blows the log over Hydra's limit "-Wno-expansion-to-defined" - # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit - "-Wno-class-memaccess" ] + # with gcc8, -Wclass-memaccess became part of -Wall and this too exceeds the logging limit + ++ optional stdenv.cc.isGNU "-Wno-class-memaccess" # with clang this warning blows the log over Hydra's limit ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" ++ optionals flashplayerFix |