From 9feaa02b07544cf4a6b1577681fca2cbedb2fdfb Mon Sep 17 00:00:00 2001 From: Niklas Larsson Date: Wed, 28 Aug 2019 01:09:23 +0200 Subject: [PATCH] Compatibility with Cabal 3.0 Use the v1 cabal commands --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 63b62a2019..974e3d7d0e 100644 --- a/Makefile +++ b/Makefile @@ -15,14 +15,14 @@ endif endif install: - $(CABAL) install $(CABALFLAGS) + $(CABAL) v1-install $(CABALFLAGS) pinstall: CABALFLAGS += --enable-executable-profiling pinstall: dist/setup-config - $(CABAL) install $(CABALFLAGS) + $(CABAL) v1-install $(CABALFLAGS) build: dist/setup-config - $(CABAL) build $(CABALFLAGS) + $(CABAL) v1-build $(CABALFLAGS) test: doc test_c stylize @@ -49,7 +49,7 @@ lib_clean: $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean relib: lib_clean - $(CABAL) install $(CABALFLAGS) + $(CABAL) v1-install $(CABALFLAGS) linecount: wc -l src/Idris/*.hs src/Idris/Elab/*.hs src/Idris/Core/*.hs src/IRTS/*.hs src/Pkg/*.hs src/Util/*.hs @@ -76,7 +76,7 @@ user_doc_pdf: $(MAKE) -C docs latexpdf fast: - $(CABAL) install $(CABALFLAGS) --ghc-option=-O0 + $(CABAL) v1-install $(CABALFLAGS) --ghc-option=-O0 dist/setup-config: - $(CABAL) configure $(CABALFLAGS) + $(CABAL) v1-configure $(CABALFLAGS)