Commit c0cca2ea authored by sof's avatar sof
Browse files

[project @ 2005-03-24 18:44:16 by sof]

SRC_HC_OPTS: only add -ignore-package if supported by underlying GHC.
             (reqd to be able to compile greencard/lib, hdirect/(com)lib with
	     non-cutting edge GHCen.)

Merge to STABLE.
parent 19519dc3
# -----------------------------------------------------------------------------
# $Id: package.mk,v 1.49 2005/03/03 21:01:49 wolfgang Exp $
# $Id: package.mk,v 1.50 2005/03/24 18:44:16 sof Exp $
ifneq "$(PACKAGE)" ""
......@@ -161,7 +161,18 @@ 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 $(PACKAGE)"; fi)
else
SRC_HC_OPTS += -ignore-package $(PACKAGE)
endif
endif
SRC_HC_OPTS += $(GhcLibHcOpts)
SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment