Skip to content

Commit aed1df3

Browse files
committed
rts.cabal: double all the flags to ensure we definetly get them set
This is kidna stupid. Julian hit something similar with the THREADED one :-/
1 parent 38af39d commit aed1df3

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

rts/rts.cabal

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -615,25 +615,35 @@ common rts-link-options
615615
ld-options: -read_only_relocs warning
616616

617617
common rts-global-build-flags
618-
ghc-options: -DCOMPILING_RTS
618+
ghc-options: -DCOMPILING_RTS -optc-DCOMPILING_RTS
619619
cpp-options: -DCOMPILING_RTS
620+
cmm-options: -DCOMPILING_RTS
621+
cc-options: -DCOMPILING_RTS
620622
if !flag(smp)
621-
ghc-options: -DNOSMP
623+
ghc-options: -DNOSMP -optc-DNOSMP
622624
cpp-options: -DNOSMP
625+
cmm-options: -DNOSMP
626+
cc-options: -DNOSMP
623627
if flag(dynamic)
624-
ghc-options: -DDYNAMIC
628+
ghc-options: -DDYNAMIC -optc-DDYNAMIC
625629
cpp-options: -DDYNAMIC
630+
cmm-options: -DDYNAMIC
631+
cc-options: -DDYNAMIC
626632
if flag(thread-sanitizer)
627633
cc-options: -fsanitize=thread
628634
ld-options: -fsanitize=thread
629635

630636
common rts-debug-flags
631-
ghc-options: -optc-DDEBUG
637+
ghc-options: -DDEBUG -optc-DDEBUG
632638
cpp-options: -DDEBUG -fno-omit-frame-pointer -g3 -O0
639+
cmm-options: -DDEBUG -fno-omit-frame-pointer -g3 -O0
640+
cc-options: -DDEBUG -fno-omit-frame-pointer -g3 -O0
633641

634642
common rts-threaded-flags
635-
ghc-options: -DTHREADED_RTS
643+
ghc-options: -DTHREADED_RTS -optc-DTHREADED_RTS
636644
cpp-options: -DTHREADED_RTS
645+
cmm-options: -DTHREADED_RTS
646+
cc-options: -DTHREADED_RTS
637647

638648
-- the _main_ library needs to deal with all the _configure_ time stuff.
639649
library

0 commit comments

Comments
 (0)