Malcolm Wallace (malcolm-nhc@cs.york.ac.uk)
Thu, 9 Mar 2000 17:47:54 +0000
The patch I just posted (to update hmake to work with ghc-4.06) was slightly incorrect. Apologies. Throw it away and use the amended patch below instead. Regards, Malcolm diff -u -r1.13 confhc --- script/confhc 2000/01/20 18:05:06 1.13 +++ script/confhc 2000/03/09 17:44:30 @@ -229,6 +229,7 @@ 0.29) sed -e "s|^GHC=0$|GHC=2|" ;; 2.*) sed -e "s|^GHC=0$|GHC=3|" ;; 3.*) sed -e "s|^GHC=0$|GHC=4|" ;; + 4.06) sed -e "s|^GHC=0$|GHC=6|" ;; 4.*) sed -e "s|^GHC=0$|GHC=5|" ;; *) sed -e "s|^GHC=0$|GHC=6|" ;; esac diff -u -r1.6 hmakeconfig.inst --- script/hmakeconfig.inst 2000/01/25 10:31:57 1.6 +++ script/hmakeconfig.inst 2000/03/09 17:44:31 @@ -90,6 +90,7 @@ # Depending on compiler version, we have to choose cpp symbols. # GHC can take the values 2,3,4,5, corresponding to 1.2, 1.3, 1.4, and 98. +# (value 6 added to allow for hslibs reorganisation) GHC=0 if [ ${GHC} -lt 5 ] then @@ -97,10 +98,16 @@ # GHCINCPATH is a colon-separated list of directories containing .hi files GHCINCPATH=":"${GHCINCPATH-${GHCINCDIR}} GHCCPP="-Z__HASKELL1__=${GHC}" -else +elif [ ${GHC} -lt 6 ] +then # ghc, for Haskell'98 # GHCINCPATH is a colon-separated list of directories containing .hi files GHCINCPATH=":"${GHCINCPATH-"${GHCINCDIR}/std:${GHCINCDIR}/exts:${GHCINCDIR}/misc:${GHCINCDIR}/posix"} + GHCCPP="-Z__HASKELL1__=5 ${HASKELL98}" +else + # ghc, for Haskell'98, with new hslibs + # GHCINCPATH is a colon-separated list of directories containing .hi files + GHCINCPATH=":"${GHCINCPATH-"${GHCINCDIR}/std:${GHCINCDIR}/data:${GHCINCDIR}/lang:${GHCINCDIR}/posix:${GHCINCDIR}/net:${GHCINCDIR}/num:${GHCINCDIR}/text:${GHCINCDIR}/util:${GHCINCDIR}/win32"} GHCCPP="-Z__HASKELL1__=5 ${HASKELL98}" fi GHCPRELOPTS=`echo $GHCINCPATH | sed -e "s/:/ -P/g"` -------------------------------------------------------------------- To unsubscribe, send a message containing the word `unsubscribe' to: nhc-users-request@cs.york.ac.uk --------------------------------------------------------------------