diff options
author | simonmar <unknown> | 2005-03-29 14:02:06 +0000 |
---|---|---|
committer | simonmar <unknown> | 2005-03-29 14:02:06 +0000 |
commit | 11807eb601082e4e82b589803fe5d08a9de4208d (patch) | |
tree | 18642c6718853554ff3280181d2e7eff07db7a7a /mk | |
parent | 70960d2ef24add2911e5613ca25cf1d226b2e082 (diff) | |
download | haskell-11807eb601082e4e82b589803fe5d08a9de4208d.tar.gz |
[project @ 2005-03-29 14:02:06 by simonmar]
Old GHCs used -package-name instead of -ignore-package.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/package.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mk/package.mk b/mk/package.mk index 9e05818a76..ef22c33d26 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: package.mk,v 1.50 2005/03/24 18:44:16 sof Exp $ +# $Id: package.mk,v 1.51 2005/03/29 14:02:06 simonmar Exp $ ifneq "$(PACKAGE)" "" @@ -168,14 +168,15 @@ 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) +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 +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, |