diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-07-27 09:00:01 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-07-28 06:17:32 -0400 |
| commit | 10678945c1d3261273a1d7a389d14a69f4e28567 (patch) | |
| tree | 97bc71afc37c010f34b7b6279a64c36df3d59f87 | |
| parent | 323473e86d40988883062e5aeaef97bee943b901 (diff) | |
| download | haskell-10678945c1d3261273a1d7a389d14a69f4e28567.tar.gz | |
rts: Don't rely on configuration when CLEANING=YES
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.mk | 4 |
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 |