Skip to content

Commit 795c3db

Browse files
committed
Don't insert rts options stanza imports for library
1 parent e933e26 commit 795c3db

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

cabal-install/src/Distribution/Client/Init/FileCreators.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,15 @@ writeProject (ProjectSettings opts pkgDesc libTarget exeTarget testTarget)
7575
commonStanza = mkCommonStanza opts
7676
extensionsStanza = mkExtensionsStanza opts
7777
ghcOptionsStanza = mkGhcOptionsStanza opts
78+
rtsOptionsStanza = mkRtsOptionsStanza opts
7879

7980
libStanza <- prepareLibTarget opts libTarget
8081
exeStanza <- prepareExeTarget opts exeTarget
8182
testStanza <- prepareTestTarget opts testTarget
8283

8384
(reusedCabal, cabalContents) <-
8485
writeCabalFile opts $
85-
pkgFields ++ [extensionsStanza, ghcOptionsStanza, commonStanza, libStanza, exeStanza, testStanza]
86+
pkgFields ++ [extensionsStanza, ghcOptionsStanza, rtsOptionsStanza, commonStanza, libStanza, exeStanza, testStanza]
8687

8788
when (null $ _pkgSynopsis pkgDesc) $
8889
message opts T.Warning "No synopsis given. You should edit the .cabal file and add one."

cabal-install/src/Distribution/Client/Init/Format.hs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,21 @@ insertCommonStanzas opts =
189189
["Common compiler warnings and optimisations"]
190190
False
191191
opts
192-
, field
192+
]
193+
194+
insertRtsOptionsStanza :: WriteOpts -> [PrettyField FieldAnnotation]
195+
insertRtsOptionsStanza opts =
196+
case specHasCommonStanzas $ _optCabalSpec opts of
197+
NoCommonStanzas -> [PrettyEmpty]
198+
_ ->
199+
[ field
193200
"import"
194201
(hsep . map text)
195202
["rts-options"]
196203
["Common RTS options"]
197204
False
198205
opts
199206
]
200-
201207
mkLibStanza :: WriteOpts -> LibTarget -> PrettyField FieldAnnotation
202208
mkLibStanza opts (LibTarget srcDirs lang expMods otherMods exts deps tools) =
203209
PrettySection
@@ -264,6 +270,7 @@ mkExeStanza opts (ExeTarget exeMain appDirs lang otherMods exts deps tools) =
264270
(toUTF8BS "executable")
265271
[exeName]
266272
( insertCommonStanzas opts
273+
++ insertRtsOptionsStanza opts
267274
++ [ field
268275
"main-is"
269276
unsafeFromHs
@@ -325,6 +332,7 @@ mkTestStanza opts (TestTarget testMain dirs lang otherMods exts deps tools) =
325332
(toUTF8BS "test-suite")
326333
[suiteName]
327334
( insertCommonStanzas opts
335+
++ insertRtsOptionsStanza opts
328336
++ [ case specHasCommonStanzas $ _optCabalSpec opts of
329337
NoCommonStanzas -> PrettyEmpty
330338
_ ->

0 commit comments

Comments
 (0)