diff options
-rw-r--r-- | compiler/main/DynFlags.hs | 3 | ||||
-rw-r--r-- | mk/validate-settings.mk | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index 6300cf3ec9..787f067182 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -2346,7 +2346,8 @@ standardWarnings Opt_WarnWrongDoBind, Opt_WarnAlternativeLayoutRuleTransitional, Opt_WarnPointlessPragmas, - Opt_WarnUnsupportedCallingConventions + Opt_WarnUnsupportedCallingConventions, + Opt_WarnInlineRuleShadowing ] minusWOpts :: [WarningFlag] diff --git a/mk/validate-settings.mk b/mk/validate-settings.mk index ba3b4879e6..08300b933f 100644 --- a/mk/validate-settings.mk +++ b/mk/validate-settings.mk @@ -110,9 +110,10 @@ libraries/binary_dist-install_EXTRA_HC_OPTS += -fno-warn-warnings-deprecations libraries/binary/src/Data/Binary/Builder/Base_HC_OPTS += -fno-warn-warnings-deprecations libraries/binary/src/Data/Binary/Get_HC_OPTS += -fno-warn-warnings-deprecations +# Temporarely disable inline rule shadowing warning +libraries/bytestring_dist-install_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing +libraries/template-haskell_dist-install_EXTRA_HC_OPTS += -fno-warn-inline-rule-shadowing + # We need -fno-warn-deprecated-flags to avoid failure with -Werror GhcLibHcOpts += -fno-warn-deprecated-flags GhcBootLibHcOpts += -fno-warn-deprecated-flags - -# Temporarely disable rule shadowing warning -GhcLibHcOpts += -fno-warn-inline-rule-shadowing |