[project @ 1998-08-06 10:35:59 by sof]

Fool mkdependHS

diff --git a/ghc/lib/exts/Dynamic.lhs b/ghc/lib/exts/Dynamic.lhs
index dc47cfd..4844e3d 100644 (file)
--- a/ghc/lib/exts/Dynamic.lhs
+++ b/ghc/lib/exts/Dynamic.lhs
@@ -69,7 +69,8 @@ import Foreign ( ForeignObj, StablePtr )
 import PrelConc ( MVar )
    END_FOR_GHC -}
 {- BEGIN_FOR_HUGS -}
-import Concurrent ( MVar )
+import   -- fool mkdependHS
+       Concurrent ( MVar )
 {- END_FOR_HUGS -}
 import Word  ( Word8, Word16, Word32, Word64 )
 import Int   ( Int8, Int16, Int32 )

diff --git a/ghc/lib/exts/Makefile b/ghc/lib/exts/Makefile
index 770f7eb..22e19c5 100644 (file)
--- a/ghc/lib/exts/Makefile
+++ b/ghc/lib/exts/Makefile
@@ -42,12 +42,14 @@ endif
 Int_HC_OPTS          += -H8m -fno-prune-tydecls
 Word_HC_OPTS         += -H8m
 NativeInfo_HC_OPTS   += -fno-prune-tydecls
-Dynamic_HC_OPTS             += -DBEGIN_FOR_GHC='-}' -DEND_FOR_GHC='{-' -DBEGIN_FOR_HUGS='{-' -DEND_FOR_HUGS='-}'
+Dynamic_HC_OPTS             += $(MAGIC_HSCPP_OPTS)
+
+MAGIC_HSCPP_OPTS=-DBEGIN_FOR_GHC='-}' -DEND_FOR_GHC='{-' -DBEGIN_FOR_HUGS='{-' -DEND_FOR_HUGS='-}'
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
 
-SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -optdep--include-prelude -optdep-w
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -optdep--include-prelude -optdep-w $(MAGIC_HSCPP_OPTS)
 
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries