[project @ 2005-03-29 14:02:06 by simonmar]

[ghc-hetmet.git] / mk / package.mk

diff --git a/mk/package.mk b/mk/package.mk
index 7397e63..ef22c33 100644 (file)
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: package.mk,v 1.48 2005/02/10 13:38:35 simonmar Exp $
+# $Id: package.mk,v 1.51 2005/03/29 14:02:06 simonmar Exp $
 
 ifneq "$(PACKAGE)" ""
 
@@ -161,10 +161,22 @@ endif
 SRC_HSC2HS_OPTS += -I.
 
 ifeq "$(NON_HS_PACKAGE)" ""
+# 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 "$(STANDALONE_PACKAGE)" "NO"
 SRC_HC_OPTS    += -ignore-package $(PACKAGE)
+else
+ifneq "$(strip $(GHC))" ""
+# Making the assumption here that standalone packages will be using mk/config.mk:GHC
+SRC_HC_OPTS = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi) $(PACKAGE)
+else
+SRC_HC_OPTS    += -ignore-package $(PACKAGE)
+endif
+endif # STANDALONE_PACKAGE
+
 SRC_HC_OPTS    += $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
-endif
+endif # NON_HS_PACKAGE
 
 #      -fgenerics switches on generation of support code for 
 #              derivable type classes.  This is now off by default,
@@ -327,7 +339,7 @@ $(DYLD_LIBRARY) : $(LIBOBJS) $(STUBOBJS)
        $(CC) -shared -o $@ $(STUBOBJS) $(LIBOBJS)
 endif
 
-ifneq "$(PACKAGE)" ""
+ifneq "$(NO_INSTALL_LIBRARY)" "YES"
 INSTALL_LIBS += $(DYLD_LIBRARY)
 endif