diff options
| author | Duncan Coutts <duncan@well-typed.com> | 2014-08-27 16:33:20 +0100 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-08-29 15:03:33 +0100 |
| commit | da7289882610ccae3f16c74be7440d19c29ecd20 (patch) | |
| tree | 2d374702f29d934ac872de47661c4bda2d4827fe /testsuite/tests/ghci/linking/Makefile | |
| parent | 01461ce86f9d4bd3a4969b43aa9d237949ca3ce6 (diff) | |
| download | haskell-da7289882610ccae3f16c74be7440d19c29ecd20.tar.gz | |
Change testsuite to not use old-style file package databases
Now uses ghc-pkg init. The file-style databases are no longer supported.
Diffstat (limited to 'testsuite/tests/ghci/linking/Makefile')
| -rw-r--r-- | testsuite/tests/ghci/linking/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/ghci/linking/Makefile b/testsuite/tests/ghci/linking/Makefile index 08c5158acc..5b8e23c66c 100644 --- a/testsuite/tests/ghci/linking/Makefile +++ b/testsuite/tests/ghci/linking/Makefile @@ -63,7 +63,7 @@ ghcilink004 : echo 'key: test-1.0' >>$(PKG004) echo 'library-dirs: $${pkgroot}' >>$(PKG004) echo 'extra-libraries: foo' >>$(PKG004) - echo '[]' >$(LOCAL_PKGCONF004) + '$(GHC_PKG)' init $(LOCAL_PKGCONF004) '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF004) register $(PKG004) -v0 # "$(TEST_HC)" -c f.c -o dir004/foo.o @@ -91,7 +91,7 @@ ghcilink005 : echo 'key: test-1.0' >>$(PKG005) echo 'library-dirs: $${pkgroot}' >>$(PKG005) echo 'extra-libraries: foo' >>$(PKG005) - echo '[]' >$(LOCAL_PKGCONF005) + '$(GHC_PKG)' init $(LOCAL_PKGCONF005) '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF005) register $(PKG005) -v0 # "$(TEST_HC)" -c -dynamic f.c -o dir005/foo.o @@ -115,7 +115,7 @@ ghcilink006 : echo "id: test-XXX" >>$(PKG006) echo "key: test-1.0" >>$(PKG006) echo "extra-libraries: stdc++" >>$(PKG006) - echo "[]" >$(LOCAL_PKGCONF006) + '$(GHC_PKG)' init $(LOCAL_PKGCONF006) '$(GHC_PKG)' --no-user-package-db -f $(LOCAL_PKGCONF006) register $(PKG006) -v0 # echo ":q" | "$(TEST_HC)" --interactive -ignore-dot-ghci -v0 -package-db $(LOCAL_PKGCONF006) -package test |