X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fpackage.mk;h=b0841ba454c37f1b393b0cecdf0ce4848518ee16;hb=4bcd03a67e66e584da936d38ac91e3d72bf9cf78;hp=d77eb33d7edc54347780da19b31b4f3897bd9801;hpb=524b54cec5d3c20edf65b46bf51fff6c839700ab;p=ghc-hetmet.git

diff --git a/mk/package.mk b/mk/package.mk
index d77eb33..b0841ba 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.49 2005/03/03 21:01:49 wolfgang Exp $
+# $Id: package.mk,v 1.52 2005/03/29 14:06:02 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -154,14 +154,24 @@ endif # $(way) == ""
 # -----------------------------------------------------------------------------
 # Building the static library libHS<pkg>.a
 
+SRC_HSC2HS_OPTS += -I.
+
 ifeq "$(STANDALONE_PACKAGE)" "NO"
 HC = $(GHC_INPLACE)
-endif
-
-SRC_HSC2HS_OPTS += -I.
+IGNORE_PACKAGE_FLAG = -ignore-package
+else
+# Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later.
+# (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.)
+ifeq "$(strip $(GHC))" ""
+IGNORE_PACKAGE_FLAG = -ignore-package
+else
+# Making the assumption here that standalone packages will be using mk/config.mk:GHC
+IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi)
+endif 
+endif # STANDALONE_PACKAGE
 
 ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS 	+= -ignore-package $(PACKAGE)
+SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG) $(PACKAGE)
 SRC_HC_OPTS 	+= $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
 endif