summaryrefslogtreecommitdiff
path: root/bindisttest/ghc.mk
diff options
context:
space:
mode:
authorPaolo Capriotti <p.capriotti@gmail.com>2012-05-04 13:04:43 +0100
committerPaolo Capriotti <p.capriotti@gmail.com>2012-05-15 08:22:42 +0100
commitca2debb201bf44b518bc06a8d37ca1017ccf390f (patch)
tree95a367120912de4bced45658320d79289fd70a49 /bindisttest/ghc.mk
parent6a831be4aa73e86568256813ffa862d7cfd5732d (diff)
downloadhaskell-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 'bindisttest/ghc.mk')
-rw-r--r--bindisttest/ghc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk
index e051be0ccd..c911da5e8c 100644
--- a/bindisttest/ghc.mk
+++ b/bindisttest/ghc.mk
@@ -48,8 +48,8 @@ endif
$(BIN_DIST_INST_DIR)/bin/ghc --make bindisttest/HelloWorld
bindisttest/HelloWorld > bindisttest/output
$(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output
-# Without --no-user-package-conf we might pick up random packages from ~/.ghc
- $(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf
+# Without --no-user-package-db we might pick up random packages from ~/.ghc
+ $(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-db
$(eval $(call clean-target,bindisttest,all,$(BIN_DIST_INST_DIR) $(wildcard bindisttest/a/b/c/*) bindisttest/HelloWorld bindisttest/HelloWorld.o bindisttest/HelloWorld.hi bindisttest/output))