From ca2debb201bf44b518bc06a8d37ca1017ccf390f Mon Sep 17 00:00:00 2001 From: Paolo Capriotti Date: Fri, 4 May 2012 13:04:43 +0100 Subject: 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. --- bindisttest/Makefile | 4 ++-- bindisttest/ghc.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bindisttest') diff --git a/bindisttest/Makefile b/bindisttest/Makefile index 238bce7650..7d20bdbf39 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -48,8 +48,8 @@ endif $(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld ./HelloWorld > output $(CONTEXT_DIFF) output 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 clean distclean: "$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR) 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)) -- cgit v1.2.1