summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2023-01-07 18:11:54 +0000
committerMatthew Pickering <matthewtpickering@gmail.com>2023-01-09 16:54:07 +0000
commit926cd4ee097106cf9c6d1ae1fc32375e7fc45ff2 (patch)
treeaad4226060986e569acf76a20ed227d517caf122
parent78a9bec6d43cd5d5e314532d919893e9f23fc177 (diff)
downloadhaskell-wip/no_fixup_chains_2.tar.gz
Check for FP_LD_NO_FIXUP_CHAINS in installation configure scriptwip/no_fixup_chains_2
Otherwise, when installing from a bindist the C flag isn't passed to the C compiler. This completes the fix for #22429
-rw-r--r--distrib/configure.ac.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 8c0caa56e1..3efadcc177 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -171,6 +171,11 @@ FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE1],[CONF_GCC_LINKER_OPTS_STAG
# Stage 3 won't be supported by cross-compilation
FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_GCC_LINKER_OPTS_STAGE2],[CONF_LD_LINKER_OPTS_STAGE2],[CONF_CPP_OPTS_STAGE2])
+FP_LD_NO_FIXUP_CHAINS([target], [LDFLAGS])
+FP_LD_NO_FIXUP_CHAINS([build], [CONF_GCC_LINKER_OPTS_STAGE0])
+FP_LD_NO_FIXUP_CHAINS([target], [CONF_GCC_LINKER_OPTS_STAGE1])
+FP_LD_NO_FIXUP_CHAINS([target], [CONF_GCC_LINKER_OPTS_STAGE2])
+
AC_SUBST(CONF_CC_OPTS_STAGE0)
AC_SUBST(CONF_CC_OPTS_STAGE1)
AC_SUBST(CONF_CC_OPTS_STAGE2)