diff options
| author | Inari Listenmaa <inari.listenmaa@gmail.com> | 2017-08-21 10:26:57 +0300 |
|---|---|---|
| committer | Inari Listenmaa <inari.listenmaa@gmail.com> | 2017-08-21 10:26:57 +0300 |
| commit | c89759e6388aa00a82c9a4847be73c9e71726147 (patch) | |
| tree | 5994c67ad1d79820d18451518265de5c91c60b30 /WebSetup.hs | |
| parent | 2d85550e5466c18f248321f7eab333025098ea53 (diff) | |
| parent | 0a3b822313cc664cef860b39ec74c21e0d00475b (diff) | |
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
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 - _ ->-} "" + _ -> "" |
