summaryrefslogtreecommitdiff
path: root/WebSetup.hs
diff options
context:
space:
mode:
authorKrasimir Angelov <kr.angelov@gmail.com>2017-08-18 21:27:40 +0200
committerKrasimir Angelov <kr.angelov@gmail.com>2017-08-18 21:27:40 +0200
commit0a3b822313cc664cef860b39ec74c21e0d00475b (patch)
tree5994c67ad1d79820d18451518265de5c91c60b30 /WebSetup.hs
parent1f3c9d0b1736daa979e195bc07d971421768e4ad (diff)
parent0a0eaa01bcbe9574bb86a6470ca5139fbd32a9d3 (diff)
????
Merge branch 'master' of www.grammaticalframework.org:/usr/local/www/GF
Diffstat (limited to 'WebSetup.hs')
-rw-r--r--WebSetup.hs7
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
- _ ->-} ""
+ _ -> ""