git.iko.soy/Idris-dev
on master help sign in
Compatibility with Cabal 3.0
9feaa02Niklas Larsson
Makefile+6−6
compare with master
unifiedsplit
@@ -15,14 +15,14 @@ endif
15endif
15endif
16
16
17install:
17install:
18− $(CABAL) install $(CABALFLAGS)
18+ $(CABAL) v1-install $(CABALFLAGS)
19
19
20pinstall: CABALFLAGS += --enable-executable-profiling
20pinstall: CABALFLAGS += --enable-executable-profiling
21pinstall: dist/setup-config
21pinstall: dist/setup-config
22− $(CABAL) install $(CABALFLAGS)
22+ $(CABAL) v1-install $(CABALFLAGS)
23
23
24build: dist/setup-config
24build: dist/setup-config
25− $(CABAL) build $(CABALFLAGS)
25+ $(CABAL) v1-build $(CABALFLAGS)
26
26
27test: doc test_c stylize
27test: doc test_c stylize
28
28
@@ -49,7 +49,7 @@ lib_clean:
49 $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean
49 $(MAKE) -C libs IDRIS=../../dist/build/idris/idris RTS=../../dist/build/rts/libidris_rts clean
50
50
51relib: lib_clean
51relib: lib_clean
52− $(CABAL) install $(CABALFLAGS)
52+ $(CABAL) v1-install $(CABALFLAGS)
53
53
54linecount:
54linecount:
55 wc -l src/Idris/*.hs src/Idris/Elab/*.hs src/Idris/Core/*.hs src/IRTS/*.hs src/Pkg/*.hs src/Util/*.hs
55 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:
76 $(MAKE) -C docs latexpdf
76 $(MAKE) -C docs latexpdf
77
77
78fast:
78fast:
79− $(CABAL) install $(CABALFLAGS) --ghc-option=-O0
79+ $(CABAL) v1-install $(CABALFLAGS) --ghc-option=-O0
80
80
81dist/setup-config:
81dist/setup-config:
82− $(CABAL) configure $(CABALFLAGS)
82+ $(CABAL) v1-configure $(CABALFLAGS)