diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-06-23 16:57:52 -0400 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2022-07-05 11:14:36 +0100 |
| commit | 14bc293dc3b424023e6d0f1419d645b9bb6e0f77 (patch) | |
| tree | de3468c97b8d210cc7634b993f4ba9d9b8e52e01 | |
| parent | 038cc8564644e8f4fd1ad6b2ea5378d8c6c74133 (diff) | |
| download | haskell-14bc293dc3b424023e6d0f1419d645b9bb6e0f77.tar.gz | |
configure: Only probe for LD in FIND_LD
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.
(cherry picked from commit 995ea44d929d6141bb1a83912f45e9802faffb33)
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 696015319d..3d3b53b2a3 100644 --- a/configure.ac +++ b/configure.ac @@ -357,7 +357,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]) |