diff options
| author | Thomas Hallgren <th-github@altocumulus.org> | 2017-08-18 11:55:44 +0200 |
|---|---|---|
| committer | Thomas Hallgren <th-github@altocumulus.org> | 2017-08-18 11:55:44 +0200 |
| commit | 0a0eaa01bcbe9574bb86a6470ca5139fbd32a9d3 (patch) | |
| tree | 6589f7ab9c1abbadf5d054f3c47f5b056e875af8 /WebSetup.hs | |
| parent | 5ab8b7082cbe6039a952b7f8bd31c16f6a5f3375 (diff) | |
Bump version requirements to base>=4.6, Cabal>=1.20
Cabal>=1.20 allows control over parallelism when compiling grammars from
Setup.hs and WebSetup.hs.
base>=4.6 allows conditional compilation with CPP to be eliminated from
a few modules.
base-4.6 corresponds to GHC 7.6.3, which is what you get in
Debian 8 (aka jessie, aka oldstable) from 2015.
Diffstat (limited to 'WebSetup.hs')
| -rw-r--r-- | WebSetup.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebSetup.hs b/WebSetup.hs index 3e2e0832d..ee9f741d6 100644 --- a/WebSetup.hs +++ b/WebSetup.hs @@ -98,14 +98,13 @@ execute command args = showArg arg = if ' ' `elem` arg then "'" ++ arg ++ "'" else arg -- | This function is used to enable parallel compilation of the RGL and --- example grammars, but it is commented out by default --- to avoid casing problems for developers using Cabal<1.20 +-- example grammars numJobs flags = if null n then ["-j","+RTS","-A20M","-N","-RTS"] else ["-j="++n,"+RTS","-A20M","-N"++n,"-RTS"] where -- buildNumJobs is only available in Cabal>=1.20 - n = {-case buildNumJobs flags of + n = case buildNumJobs flags of Flag mn | mn/=Just 1-> maybe "" show mn - _ ->-} "" + _ -> "" |