Use `-Wno-tabs` more targetted
authorHerbert Valerio Riedel <hvr@gnu.org>
Fri, 18 Dec 2015 09:45:22 +0000 (10:45 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Fri, 18 Dec 2015 09:48:53 +0000 (10:48 +0100)
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

libraries/haskeline
mk/warnings.mk

index 56a17bd..8a017cc 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 56a17bd9b917ace9045991cddb882636c1508002
+Subproject commit 8a017ccdd85a391fd0dfcd5310f7adbb07970233
index 63b705f..e2b80be 100644 (file)
@@ -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