diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-05-04 13:04:43 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-05-15 08:22:42 +0100 |
| commit | ca2debb201bf44b518bc06a8d37ca1017ccf390f (patch) | |
| tree | 95a367120912de4bced45658320d79289fd70a49 /aclocal.m4 | |
| parent | 6a831be4aa73e86568256813ffa862d7cfd5732d (diff) | |
| download | haskell-ca2debb201bf44b518bc06a8d37ca1017ccf390f.tar.gz | |
Rename package-conf flags to package-db.
Rename package database flags in both GHC and ghc-pkg so that they are
consistent with Cabal nomenclature.
Add a version check to the build system so that the correct set of
package db flags are used when the bootstrapping GHC has version < 7.5.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c196bdf026..f05dfe96ea 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1808,7 +1808,7 @@ AC_MSG_NOTICE(Building in-tree ghc-pwd) dnl except we don't want to have to know what make is called. Sigh. rm -rf utils/ghc-pwd/dist-boot mkdir utils/ghc-pwd/dist-boot - if ! "$WithGhc" -v0 -no-user-package-conf -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd + if ! "$WithGhc" -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd then AC_MSG_ERROR([Building ghc-pwd failed]) fi |