From: simonmar <unknown>
Date: Thu, 16 Jun 2005 09:51:45 +0000 (+0000)
Subject: [project @ 2005-06-16 09:51:45 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~423
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=70cd0a48554ff3095fc543d1002434c84ce404be;p=ghc-hetmet.git

[project @ 2005-06-16 09:51:45 by simonmar]
oops, bring runghc in on the shared-compat.mk game
---

diff --git a/ghc/utils/runghc/Makefile b/ghc/utils/runghc/Makefile
index 0bd4330..fd18313 100644
--- a/ghc/utils/runghc/Makefile
+++ b/ghc/utils/runghc/Makefile
@@ -7,30 +7,14 @@ INSTALL_PROGS   += $(HS_PROG)
 UseGhcForCc = YES
 SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 
-SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR)
-SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat
+# This causes libghccompat.a to be used:
+include $(GHC_LIB_COMPAT_DIR)/compat.mk
 
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
 # we must also build with $(GhcHcOpts) here:
 SRC_HC_OPTS += $(GhcHcOpts)
 
-# This is horrible.  We ought to be able to omit the entire directory
-# from mkDependHS.
-SRC_MKDEPENDHS_OPTS += \
-	-optdep--exclude-module=Compat.RawSystem \
-	-optdep--exclude-module=Compat.Directory \
-	-optdep--exclude-module=Distribution.Compat.ReadP \
-	-optdep--exclude-module=Distribution.Extension \
-	-optdep--exclude-module=Distribution.GetOpt \
-	-optdep--exclude-module=Distribution.InstalledPackageInfo \
-	-optdep--exclude-module=Distribution.License \
-	-optdep--exclude-module=Distribution.Package \
-	-optdep--exclude-module=Distribution.ParseUtils \
-	-optdep--exclude-module=Distribution.Setup \
-	-optdep--exclude-module=Distribution.Version \
-	-optdep--exclude-module=System.Directory.Internals
-
 all :: runhaskell
 
 runhaskell : $(HS_PROG)