Merge pull request #70544 from d-goldin/fix_qtweb_warning_clang
qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang
This commit is contained in:
commit
392eebdb28
@ -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") [
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user