summaryrefslogtreecommitdiff
path: root/mk/warnings.mk
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2015-12-18 10:45:22 +0100
committerHerbert Valerio Riedel <hvr@gnu.org>2015-12-18 10:48:53 +0100
commit77b7f24543fb23d79d58b51213577c85cf394d9d (patch)
tree6914018282b53d03b8a4685a14cf167778a0f9e5 /mk/warnings.mk
parent34393d99df6e8abec1aead0bc03ba44de218d1c8 (diff)
downloadhaskell-77b7f24543fb23d79d58b51213577c85cf394d9d.tar.gz
Use `-Wno-tabs` more targetted
So far only `time` (fixed upstream already though) and `xhtml` still require `-Wno-tabs`, so let's apply that warning suppression flag only there. This also updates the haskeline submodule to pull in a tab-fix
Diffstat (limited to 'mk/warnings.mk')
-rw-r--r--mk/warnings.mk13
1 files changed, 3 insertions, 10 deletions
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 63b705f4d7..e2b80beaea 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -55,6 +55,8 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
# haddock's attoparsec uses deprecated `inlinePerformIO`
utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations
+# not yet de-tabbed
+libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-tabs
# On Windows, there are also some unused import warnings
ifeq "$(HostOS_CPP)" "mingw32"
libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports -Wno-identities
@@ -89,6 +91,7 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wwarn
# temporarily turn off unused-imports warnings for xhtml
libraries/xhtml_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
+libraries/xhtml_dist-install_EXTRA_HC_OPTS += -Wno-tabs
libraries/dph/dph-base_dist-install_EXTRA_HC_OPTS += -Wwarn
libraries/dph/dph-prim-interface_dist-install_EXTRA_HC_OPTS += -Wwarn
@@ -110,16 +113,6 @@ libraries/Win32_dist-install_EXTRA_HC_OPTS += -Wno-trustworthy-safe
GhcLibExtraHcOpts += -Wno-deprecated-flags
GhcBootLibExtraHcOpts += -fno-warn-deprecated-flags
-# The warning suppression flag below is a temporary kludge. While working with
-# modules that contain tabs, please de-tab them so this flag can be eventually
-# removed. See
-# http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
-# for details
-#
-GhcLibExtraHcOpts += -Wno-tabs
-GhcBootLibExtraHcOpts += -fno-warn-tabs
-
-
# Note [Order of warning flags]
#
# In distdir-way-opts, build flags are added in the following order (this