summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2022-06-23 16:57:52 -0400
committerBen Gamari <ben@smart-cactus.org>2022-06-23 16:59:56 -0400
commit947874703b5e9701f2697aefc8d9eb9f7ed04407 (patch)
treeae07a0ab7afaf042c9682ab1f5c2a85ce9ae82db
parenteb4fb8493823d9b962c26507d01a921dca8b8857 (diff)
downloadhaskell-wip/T21778.tar.gz
configure: Only probe for LD in FIND_LDwip/T21778
Since 6be2c5a7e9187fc14d51e1ec32ca235143bb0d8b we would probe for LD rather early in `configure`. However, it turns out that this breaks `configure`'s `ld`-override logic, which assumes that `LD` was set by the user and aborts. Fixes #21778.
-rw-r--r--configure.ac3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 9bcfae04c6..e6c9ed6ec7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,7 +356,8 @@ else
AC_PATH_PROG([CC],[gcc], [clang])
AC_PATH_PROG([CXX],[g++], [clang++])
AC_PATH_PROG([NM],[nm])
- AC_PATH_PROG([LD],[ld])
+ # N.B. we don't probe for LD here but instead
+ # do so in FIND_LD to avoid #21778.
AC_PATH_PROG([AR],[ar])
AC_PATH_PROG([RANLIB],[ranlib])
AC_PATH_PROG([OBJDUMP],[objdump])