summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorGHC GitLab CI <ghc-ci@gitlab-haskell.org>2020-08-09 09:35:47 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-09-04 22:26:25 -0400
commit07bdcac38c90e79db9e4327f87c5400630dfe74b (patch)
treef8a20b2a435bc58c03356efd293fe939ddb9b58f /mk
parentc1e54439be3d38a1f972ac772cca7eec5e1519a9 (diff)
downloadhaskell-07bdcac38c90e79db9e4327f87c5400630dfe74b.tar.gz
configure: Avoid hard-coded ld path on Windows
The fix to #17962 ended up regressing on Windows as it failed to replicate the logic responsible for overriding the toolchain paths on Windows. This resulted in a hard-coded path to a directory that likely doesn't exist on the user's system (#18550).
Diffstat (limited to 'mk')
-rw-r--r--mk/config.mk.in10
1 files changed, 10 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 11760686ea..2c30a7f501 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -545,6 +545,16 @@ LD_STAGE1 = $(LD)
LD_STAGE2 = $(LD)
LD_STAGE3 = $(LD)
+MERGE_OBJS_STAGE0 = @MergeObjsCmd@
+MERGE_OBJS_STAGE1 = @MergeObjsCmd@
+MERGE_OBJS_STAGE2 = @MergeObjsCmd@
+MERGE_OBJS_STAGE3 = @MergeObjsCmd@
+
+MERGE_OBJS_STAGE0_FLAGS = @MergeObjsArgs@
+MERGE_OBJS_STAGE1_FLAGS = @MergeObjsArgs@
+MERGE_OBJS_STAGE2_FLAGS = @MergeObjsArgs@
+MERGE_OBJS_STAGE3_FLAGS = @MergeObjsArgs@
+
# Cross-compiling options
# See Note [CrossCompiling vs Stage1Only]
CrossCompiling = @CrossCompiling@