Only build iserv with -threaded if GhcThreaded is set
authorReid Barton <rwbarton@gmail.com>
Sun, 23 Apr 2017 14:03:22 +0000 (10:03 -0400)
committerBen Gamari <ben@smart-cactus.org>
Sun, 23 Apr 2017 15:05:48 +0000 (11:05 -0400)
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

iserv/ghc.mk

index 8497313..ff8b153 100644 (file)
@@ -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