JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang

Browse Source 
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.
This commit is contained in:
Dima 2019-10-07 00:25:04 +02:00
parent 0ce30f8c67
commit 3bfe0872b9
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View File

@ -103,7 +103,7 @@ EOF
--replace 'libs = [ "sandbox" ]' 'libs = [ "/usr/lib/libsandbox.1.dylib" ]' --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 # with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit
"-Wno-class-memaccess" "-Wno-class-memaccess"
] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [ ] ++ lib.optionals (stdenv.hostPlatform.platform.gcc.arch or "" == "sandybridge") [

7
pkgs/development/libraries/qt-5/modules/qtwebkit.nix
View File

@ -50,13 +50,12 @@ qtModule {
export qmakeFlags="$qmakeFlags CONFIG+=silent" export qmakeFlags="$qmakeFlags CONFIG+=silent"
''; '';
NIX_CFLAGS_COMPILE = NIX_CFLAGS_COMPILE = [
[
# with gcc7 this warning blows the log over Hydra's limit # with gcc7 this warning blows the log over Hydra's limit
"-Wno-expansion-to-defined" "-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 # with clang this warning blows the log over Hydra's limit
++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override" ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
++ optionals flashplayerFix ++ optionals flashplayerFix