diff options
| author | Paolo Capriotti <p.capriotti@gmail.com> | 2012-05-04 13:05:01 +0100 |
|---|---|---|
| committer | Paolo Capriotti <p.capriotti@gmail.com> | 2012-05-15 08:29:30 +0100 |
| commit | 24d70daed5082f1aa32424e12650e136ca404771 (patch) | |
| tree | f0a9e84113a2bcc7942ec97f661243bbc92b5e30 /testsuite/tests/rename | |
| parent | 37a28207a5e30fb4737f77cd8d458f2b9090275f (diff) | |
| download | haskell-24d70daed5082f1aa32424e12650e136ca404771.tar.gz | |
Rename package-conf flags to package-db.
Diffstat (limited to 'testsuite/tests/rename')
| -rw-r--r-- | testsuite/tests/rename/prog006/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/rename/prog006/Makefile b/testsuite/tests/rename/prog006/Makefile index 1e643fd6fb..0e0a60b831 100644 --- a/testsuite/tests/rename/prog006/Makefile +++ b/testsuite/tests/rename/prog006/Makefile @@ -16,7 +16,7 @@ include $(TOP)/mk/test.mk # using the supplied Cabal configuration. LOCAL_PKGCONF=local.package.conf -LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF) +LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF) rn.prog006: rm -f A.hi A.o B/C.hi B/C.o Main.hi Main.o pkg.conf @@ -31,9 +31,9 @@ rn.prog006: echo "exposed-modules: B.C" >>pkg.conf echo "[]" >$(LOCAL_PKGCONF) $(LOCAL_GHC_PKG) register pkg.conf -v0 - '$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i + '$(TEST_HC)' $(TEST_HC_OPTS) -c -package-db $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i # The -i clears the search path, so A.hs will find B.C from package test - -'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs + -'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-db $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs # No -i when compiling Main, so a from-scratch search would find a home-pkg module B.C # However, A.hi remembers that B.C came from package test, so all is ok. |