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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8e3d9d2837..aeea6a4d9e 100644 --- a/configure.ac +++ b/configure.ac @@ -161,6 +161,10 @@ if test "$BootingFromHc" = "NO"; then or --with-ghc to specify a different GHC to use.]) fi fi + + GHC_PACKAGE_DB_FLAG=package-db + FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.5],GHC_PACKAGE_DB_FLAG=package-conf) + AC_SUBST(GHC_PACKAGE_DB_FLAG) fi; # GHC is passed to Cabal, so we need a native path |