[commit: ghc] master: Use `-Wno-tabs` more targetted (77b7f24)

git at git.haskell.org git at git.haskell.org
Fri Dec 18 09:48:41 UTC 2015


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/77b7f24543fb23d79d58b51213577c85cf394d9d/ghc

>---------------------------------------------------------------

commit 77b7f24543fb23d79d58b51213577c85cf394d9d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 10:45:22 2015 +0100

    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


>---------------------------------------------------------------

77b7f24543fb23d79d58b51213577c85cf394d9d
 libraries/haskeline |  2 +-
 mk/warnings.mk      | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/libraries/haskeline b/libraries/haskeline
index 56a17bd..8a017cc 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 56a17bd9b917ace9045991cddb882636c1508002
+Subproject commit 8a017ccdd85a391fd0dfcd5310f7adbb07970233
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 63b705f..e2b80be 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



More information about the ghc-commits mailing list