some patches to CVS ghc from 2000/01/09

[Michael Weber]

Hi! 

I had to apply some patches to make today's GHC build, they're attached.

The patch to ghc/mk/paths.mk is necessary, because the ordering of variables
is important when using "simply expanded variables", i.e. the `:=' ones (I'm
using make-3.78.1).


BTW: Might I still suggest to change this CString.lhs:unpackCStringIO case:
\begin{code}
unpackCStringIO :: Addr -> IO String
unpackCStringIO addr
 | addr == nullAddr = return ""
\end{code}

to:

\begin{code}
unpackCStringIO :: Addr -> IO String
unpackCStringIO addr
 | addr == nullAddr = return "(null)"
\end{code}


Cheers,
Michael
-- 
Compaq Safety & Comfort Guide:
"Stand up and take a few minutes to stretch and exercise several times a
 day."

--- ghc4-4.06.20000109/hslibs/lang/CString.lhs.orig     Sun Jan  9 16:45:19 2000
+++ ghc4-4.06.20000109/hslibs/lang/CString.lhs  Sun Jan  9 16:45:11 2000
@@ -75,7 +75,7 @@
        ch <- readCharOffAddr addr (I# nh)
        if ch == '\0'
         then return []
-      else do
+        else do
          ls <- unpack (nh +# 1#)
          return (ch : ls)
 

--- /tmp/foo    Sun Jan  9 15:22:36 2000
+++ ghc4-4.06.20000109/ghc/mk/paths.mk  Sun Jan  9 15:45:22 2000
@@ -25,21 +25,22 @@
 GHC_UTILS_DIR          := $(TOP)/utils
 GHC_INTERPRETER_DIR    := $(TOP)/interpreter
 
-GHC_INPLACE            := $(GHC_DRIVER_DIR)/ghc-inplace
 GHC_HSCPP_DIR          := $(GHC_UTILS_DIR)/hscpp
-GHC_HSCPP              := $(GHC_HSCPP_DIR)/hscpp
+GHC_HSP_DIR            := $(GHC_HSC_DIR)
+GHC_HSC_DIR            := $(GHC_COMPILER_DIR)
 GHC_MKDEPENDHS_DIR     := $(GHC_UTILS_DIR)/mkdependHS
+GHC_SYSMAN_DIR                 := $(GHC_RUNTIME_DIR)/gum
+GHC_UNLIT_DIR          := $(GHC_UTILS_DIR)/unlit
+
+GHC_INPLACE            := $(GHC_DRIVER_DIR)/ghc-inplace
+GHC_HSCPP              := $(GHC_HSCPP_DIR)/hscpp
 GHC_MKDEPENDHS                 := $(GHC_MKDEPENDHS_DIR)/mkdependHS-inplace
 GHC_HSP                := $(GHC_HSP_DIR)/hsp
-GHC_HSP_DIR            := $(GHC_HSC_DIR)
 GHC_HSC                := $(GHC_HSC_DIR)/hsc
-GHC_HSC_DIR            := $(GHC_COMPILER_DIR)
 GHC_SYSMAN             := $(GHC_RUNTIME_DIR)/gum/SysMan
-GHC_SYSMAN_DIR                 := $(GHC_RUNTIME_DIR)/gum
 
 UNLIT                  := $(GHC_UNLIT_DIR)/unlit
 GHC_UNLIT              := $(GHC_UNLIT_DIR)/unlit
-GHC_UNLIT_DIR          := $(GHC_UTILS_DIR)/unlit
 
 #-----------------------------------------------------------------------------
 # Stuff for the C-compiling phase in particular...