Matthias Klose <matthias.kl...@canonical.com> 于2025年1月1日周三 22:37写道：
>
> in https://gcc.gnu.org/pipermail/gcc-patches/2024-January/641619.html
>
> there are two typos in the patch, compared to the local Debian patch,
>
> - the subst macro has an additional parameter
> - the multilib subdirs are not subdirs in lib, but have
> their multilib suffix attached to lib.
>
> ok for the trunk?
diff --git a/config-ml.in b/config-ml.in
index 645cac822fd..be8134b7eb1 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -517,8 +517,7 @@ multi-do:
libsuffix_=`$${compiler} $${flags} --print-multi-os-directory`; \
if (cd ../$${dir}/$${lib}; $(MAKE) $(subst \
-B$(build_tooldir)/lib/, \
- -B$(build_tooldir)/lib/$${libsuffix_}/ \
- -B$(build_tooldir)/lib/, \
Ohh, it is duplicated. OK to remove.
+ -B$(build_tooldir)/lib$${libsuffix_}/ \
It is not correct, such as
$ x86_64-linux-gnu-gcc -m32 --print-multi-os-directory
../lib32
so the '/' is needed here.
$(FLAGS_TO_PASS)) \
CFLAGS="$(CFLAGS) $${flags}" \
CCASFLAGS="$(CCASFLAGS) $${flags}" \
>
> Matthias
