Add more bang patterns, needed to fix the 32bit build

[ghc-base.git] / Makefile.nhc98

diff --git a/Makefile.nhc98 b/Makefile.nhc98
index 7da02ac..54aab94 100644 (file)
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,13 +1,14 @@
 THISPKG        = base
 SEARCH = -I$(TOPDIR)/targets/$(MACHINE) -Iinclude \
-         -I../../prelude/PreludeIO -I../../prelude/`harch`
+         -I../../prelude/PreludeIO -I../../prelude/`$(LOCAL)harch`
 EXTRA_H_FLAGS   = -H4M -K3M
 EXTRA_HBC_FLAGS = -H16M -A1M
 
 DIRS   = \
        Data Debug Control Control/Monad System System/IO System/Console \
        Text Text/Html Text/Show Text/ParserCombinators Text/Regex \
-       Foreign Foreign/Marshal Foreign/C NHC Unsafe System/Posix
+       Foreign Foreign/Marshal Foreign/C NHC Unsafe System/Posix \
+       Control/Exception
 
 SRCS   = \
        Data/Bits.hs Data/Bool.hs Data/Char.hs Data/Complex.hs \
@@ -21,14 +22,13 @@ SRCS        = \
        Data/Function.hs \
        Control/Monad.hs Control/Monad/Fix.hs Control/Monad/Instances.hs \
        Control/Arrow.hs Control/Applicative.hs \
-       Control/Exception.hs \
+       Control/Exception.hs Control/Exception/Base.hs Control/Category.hs \
        Debug/Trace.hs \
        NHC/SizedTypes.hs NHC/PosixTypes.hsc \
        System/IO.hs System/IO/Error.hs System/IO/Unsafe.hs \
        System/Environment.hs System/Exit.hs \
        System/Mem.hs System/Info.hs \
-       System/Console/GetOpt.hs \
-       System/CPUTime.hsc System/Timeout.hs \
+       System/CPUTime.hsc \
        Foreign/Ptr.hs Foreign/StablePtr.hs Foreign/Storable.hs \
        Foreign/ForeignPtr.hs Foreign/C/Types.hs \
        Foreign/Marshal/Alloc.hs Foreign/Marshal/Array.hs \
@@ -40,7 +40,7 @@ SRCS  = \
        Text/ParserCombinators/ReadP.hs Data/Version.hs \
        Unsafe/Coerce.hs \
        WCsubst.c \
-       System/Posix/Types.hs \
+       System/Posix/Types.hs System/Posix/Internals.hs \
 
 #      Data/String.hs
 #      Text/ParserCombinators/ReadPrec.hs
@@ -51,7 +51,9 @@ SRCS  = \
 #      System/Directory/Internals.hs \
 #      Text/PrettyPrint/HughesPJ.hs Text/PrettyPrint.hs \
 #      System/Random.hs System/Locale.hs System/Time.hsc \
-#      System/Cmd.hs
+#      System/Cmd.hs \
+#      System/Timeout.hs \
+#      System/Console/GetOpt.hs \
 
 #      Text/Regex/Posix.hsc Text/Regex.hs \
 #      [Data/Dynamic.hs] Data/Generics.hs Data/STRef.hs Data/Unique.hs
@@ -67,9 +69,13 @@ include ../Makefile.common
 extra:
        if [ -f Prelude.hs ]; then mv Prelude.hs Prelude.hs.unused; fi
        if [ -f Numeric.hs ]; then mv Numeric.hs Numeric.hs.unused; fi
+       $(INSTALL) include/Typeable.h $(INCDIR)/packages/$(THISPKG)
+       $(INSTALL) include/Nhc98BaseConfig.h $(INCDIR)/packages/$(THISPKG)
 extracfiles:
        if [ -f Prelude.hs ]; then mv Prelude.hs Prelude.hs.unused; fi
        if [ -f Numeric.hs ]; then mv Numeric.hs Numeric.hs.unused; fi
+       $(INSTALL) include/Typeable.h $(INCDIR)/packages/$(THISPKG)
+       $(INSTALL) include/Nhc98BaseConfig.h $(INCDIR)/packages/$(THISPKG)
 
 # Here are any extra dependencies.