summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2021-07-27 09:00:01 -0400
committerBen Gamari <ben@smart-cactus.org>2021-07-27 09:00:01 -0400
commitfaf470764c16115d616ee483826a31ba8c6ebdf0 (patch)
tree2bc0a1f17251312b8e11a1e0a8cea30ef1d7af62
parentc28933610a02e59c3e9ea41020627791a4af7028 (diff)
downloadhaskell-wip/T20166.tar.gz
rts: Don't rely on configuration when CLEANING=YESwip/T20166
The make build system doesn't source config.mk when CLEANING=YES, consequently we previously failed to identify an appropriate adjustor implementation to use during cleaning. Fixes #20166.
-rw-r--r--rts/ghc.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk
index 24a4240c59..5465508a08 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -61,6 +61,9 @@ rts_S_SRCS += rts/StgCRunAsm.S
endif
# select adjustor implementation. This much match the logic in rts.cabal.in.
+ifneq "$(CLEANING)" "YES"
+# N.B. we don't source config.mk when CLEANING=YES so none of the below
+# variables will be set. See #20166.
ifeq "$(UseLibffiForAdjustors)" "YES"
rts_C_SRCS += rts/adjustor/LibffiAdjustor.c
else
@@ -81,6 +84,7 @@ endif
endif
endif
endif
+endif
ifeq "$(GhcUnregisterised)" "YES"
GENAPPLY_OPTS = -u