> Am 10.01.2026 um 09:40 schrieb Jakub Jelinek <[email protected]>:
>
> Hi!
>
> As written earlier, the config-ml.in change from the
> --with-multi-buildlist patch broke build of Ada, Ada uses
> RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
> and expects that the primary multilib will result in rts
> rather than rts_. it results in after the --with-multi-buildlist
> changes.
>
> The following patch fixes it by restoring previous behavior for
> ml_subdir / MULTISUBDIR such that for primary multilib it is
> still empty rather than /.
>
> Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
Ok
Richard
> Another possibility would be the attached untested patch.
>
> 2026-01-10 Jakub Jelinek <[email protected]>
>
> PR ada/123490
> * config-ml.in: Restore ml_subdir being empty instead of /.
> for the primary multilib.
>
> --- config-ml.in.jj 2026-01-09 12:06:40.247967156 +0100
> +++ config-ml.in 2026-01-09 22:15:02.891647668 +0100
> @@ -615,7 +615,11 @@ fi
>
> if [ -z "${with_multisubdir}" ]; then
> ml_top_subdir=`${CC-gcc} --print-multi-directory 2>/dev/null`
> - ml_subdir=/$ml_top_subdir
> + if [ "$ml_top_subdir" = . ]; then
> + ml_subdir=
> + else
> + ml_subdir=/$ml_top_subdir
> + fi
> ml_builddotdot=
> : # ml_srcdotdot= # already set
> else
>
> Jakub
> <X>
