From: Malcolm.Wallace@me.com <unknown>
Date: Fri, 11 Feb 2011 11:16:34 +0000 (+0000)
Subject: Add Data.String to the nhc98 build
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=9c38b9d56bdf213d3964a1a6ac5b9957da0362cf

Add Data.String to the nhc98 build
---

diff --git a/Data/String.hs b/Data/String.hs
index dae81a2..ac1e416 100644
--- a/Data/String.hs
+++ b/Data/String.hs
@@ -36,6 +36,7 @@ import Data.List (lines, words, unlines, unwords)
 class IsString a where
     fromString :: String -> a
 
+#ifndef __NHC__
 instance IsString [Char] where
     fromString xs = xs
-
+#endif
diff --git a/Makefile.nhc98 b/Makefile.nhc98
index bb8d8f5..25fb832 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -17,7 +17,7 @@ SRCS	= \
 	Data/Ix.hs Data/List.hs Data/Maybe.hs \
 	Data/Ratio.hs Data/Tuple.hs Data/Word.hs \
 	Data/HashTable.hs Data/Typeable.hs Data/Dynamic.hs \
-	Data/Monoid.hs \
+	Data/Monoid.hs Data/String.hs \
 	Data/Eq.hs Data/Ord.hs Data/Fixed.hs \
 	Data/Functor.hs Data/Foldable.hs Data/Traversable.hs \
 	Data/Function.hs \