From 53ce711a59aac8f28fd120e06e08a59dc8f10a45 Mon Sep 17 00:00:00 2001 From: midipix Date: Sat, 12 Jun 2021 11:56:43 +0000 Subject: build system: configure: LDFLAGS_LAST: refined cross-compilation logic. --- configure | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e324f8d..0982754 100755 --- a/configure +++ b/configure @@ -693,9 +693,6 @@ common_defaults() mb_cflags_cmdline="$mb_cflags_cmdline $mb_cflags" mb_ldflags_cmdline="$mb_ldflags_cmdline $mb_ldflags" - # add the prefix's library directory to the linker library path - mb_ldflags_last="$mb_ldflags_last -L$mb_libdir" - # step epilog output_step_epilog } @@ -823,6 +820,19 @@ config_ccenv() exit 2 fi + # add the library directory to the linker library path + if [ "$mb_cchost" = "$mb_native_cchost" ]; then + mb_ldflags_last="$mb_ldflags_last -L$mb_libdir" + else + case "$mb_libdir" in + /*) + mb_ldflags_last="$mb_ldflags_last -L$mb_sysroot/.$mb_libdir" + ;; + *) + mb_ldflags_last="$mb_ldflags_last -L$mb_libdir" + esac + fi + # re-generate Makefile.tmp output_section_break config_copy -- cgit v1.2.3