Skip to content

Commit

Permalink
Merge pull request #4758 from melted/cabal3
Browse files Browse the repository at this point in the history
Compatibility with Cabal 3.0
  • Loading branch information
melted authored Aug 29, 2019
2 parents 075c0f7 + 9feaa02 commit 7af67ac
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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)

0 comments on commit 7af67ac

Please sign in to comment.