[commit: ghc] master: Only build iserv with -threaded if GhcThreaded is set (317ceb4)
git at git.haskell.org
git at git.haskell.org
Sun Apr 23 15:06:34 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/317ceb41e1efe0566178090fa077c4e6f4f03f10/ghc
>---------------------------------------------------------------
commit 317ceb41e1efe0566178090fa077c4e6f4f03f10
Author: Reid Barton <rwbarton at gmail.com>
Date: Sun Apr 23 10:03:22 2017 -0400
Only build iserv with -threaded if GhcThreaded is set
By default GhcThreaded is set by
```
GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
```
so it seems incorrect to try to build iserv with -threaded when
GhcThreaded is not set. This came up when I was building GHC with
some strange combination of flavours (debugged and profiled but not
threaded).
Test Plan: harbormaster
Reviewers: simonmar, austin, bgamari
Reviewed By: bgamari
Subscribers: thomie, snowleopard
Differential Revision: https://phabricator.haskell.org/D3429
>---------------------------------------------------------------
317ceb41e1efe0566178090fa077c4e6f4f03f10
iserv/ghc.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/iserv/ghc.mk b/iserv/ghc.mk
index 8497313..ff8b153 100644
--- a/iserv/ghc.mk
+++ b/iserv/ghc.mk
@@ -20,9 +20,11 @@ iserv_stage2_p_MORE_HC_OPTS += -debug
iserv_stage2_dyn_MORE_HC_OPTS += -debug
endif
+ifeq "$(GhcThreaded)" "YES"
iserv_stage2_MORE_HC_OPTS += -threaded
iserv_stage2_p_MORE_HC_OPTS += -threaded
iserv_stage2_dyn_MORE_HC_OPTS += -threaded
+endif
# Add -Wl,--export-dynamic enables GHCi to load dynamic objects that
# refer to the RTS. This is harmless if you don't use it (adds a bit
More information about the ghc-commits
mailing list