diff options
| author | simonmar <unknown> | 2004-11-11 16:07:15 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2004-11-11 16:07:15 +0000 |
| commit | 9043701ca7b0577317a852a2227e2c5112e96e0a (patch) | |
| tree | 08553b45d23a7cf1745bca0088709a46ee998158 /ghc/utils/ghc-pkg/Makefile | |
| parent | d478f224bc627b4ddc33d770e30c31523fa431d6 (diff) | |
| download | haskell-9043701ca7b0577317a852a2227e2c5112e96e0a.tar.gz | |
[project @ 2004-11-11 16:07:14 by simonmar]
The new ghc-pkg tool.
So far, the new syntax is supported, and the format of the package
definitions has changed to InstalledPackageInfo rather than the old
PackageConfig type. The format of the package.conf file is now
[InstalledPackageInfo] (using show/read).
We still support the old ghc-pkg command line syntax, and the old
PackageConfig syntax for package definitions. These are deprecated
features, of course.
Not much is done with the list of exposed/hidden modules, or versions
(yet).
Diffstat (limited to 'ghc/utils/ghc-pkg/Makefile')
| -rw-r--r-- | ghc/utils/ghc-pkg/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ghc/utils/ghc-pkg/Makefile b/ghc/utils/ghc-pkg/Makefile index 5280887129..833173af95 100644 --- a/ghc/utils/ghc-pkg/Makefile +++ b/ghc/utils/ghc-pkg/Makefile @@ -11,7 +11,10 @@ INSTALLING=1 ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi) -SRC_HC_OPTS += -cpp -DPKG_TOOL -DWANT_PRETTY +SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches + +SRC_HC_OPTS += -i$(GHC_LIB_COMPAT_DIR) +SRC_LD_OPTS += -L$(GHC_LIB_COMPAT_DIR) -lghccompat ifeq "$(ghc_ge_504)" "NO" SRC_HC_OPTS += -package lang -package util -package text @@ -37,11 +40,13 @@ EXTRA_SRCS += $(VERSION_HS) boot :: $(VERSION_HS) -Version.hs : $(TOP)/mk/version.mk +Version.hs : Makefile $(TOP)/mk/version.mk @$(RM) -f $(VERSION_HS) @echo "Creating $(VERSION_HS) ... " @echo "module Version where" >>$(VERSION_HS) - @echo "version = \"$(ProjectVersion)\"" >> $(VERSION_HS) + @echo "version = \"$(ProjectVersion)\"" >> $(VERSION_HS) + @echo "targetOS = \"$(TargetOS_CPP)\"" >> $(VERSION_HS) + @echo "targetARCH = \"$(TargetArch_CPP)\"" >> $(VERSION_HS) # ----------------------------------------------------------------------------- # ghc-pkg script @@ -70,7 +75,7 @@ SCRIPT_SUBST_VARS = GHCPKGBIN PKGCONFOPT ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32" INSTALL_SCRIPTS += $(SCRIPT_PROG) endif -PKGCONFOPT = -f $(PKGCONF) +PKGCONFOPT = --global-conf $(PKGCONF) ifeq "$(INSTALLING)" "1" SCRIPT_PROG = $(INSTALLED_SCRIPT_PROG) |