From: simonmar <unknown>
Date: Tue, 23 Nov 2004 14:24:53 +0000 (+0000)
Subject: [project @ 2004-11-23 14:24:53 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1399
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=1e0d441127678f516eb31950b8b6cc862bdeeb60;p=ghc-hetmet.git

[project @ 2004-11-23 14:24:53 by simonmar]
This should fix the build for GHC 6.3+
---

diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile
index ac372b7..9d3b311 100644
--- a/ghc/utils/ghc-pkg/Makefile
+++ b/ghc/utils/ghc-pkg/Makefile
@@ -10,6 +10,7 @@ INSTALLING=1
 # ghc-pkg.bin
 
 ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
 
 SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 
@@ -25,6 +26,10 @@ ifeq "$(ghc_ge_504)" "NO"
 SRC_HC_OPTS +=  -package lang -package util -package text
 endif
 
+ifeq "$(ghc_ge_603)" "YES"
+SRC_HC_OPTS +=  -package Cabal
+endif
+
 # On Windows, ghc-pkg is a standalone program
 # ($bindir/ghc-pkg.exe), whereas on Unix it needs a wrapper script
 # to pass the appropriate flag to the real binary