From 3be099e0ef13ee58556ba490437975c45a0da257 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 21 May 2026 03:47:37 -0400 Subject: [PATCH] crossdev: unmask multilib when multiple ABIs requested c439961 converted the old set_use_force/set_use_mask calls to the new mask/force pattern, but changed the *) default from removing multilib from the force list to actively masking it. These are not equivalent: the old code allowed multilib to be set via USE when multiple ABIs were requested; the new code prevented it unconditionally. Fix by checking MULTILIB_USE and only masking when it is "no". Fixes: c439961 ("crossdev: use package.use.{mask,force} for pie/ssp") --- crossdev | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/crossdev b/crossdev index 560ff46..20fef7f 100755 --- a/crossdev +++ b/crossdev @@ -1541,7 +1541,12 @@ set_portage() { force+=" multilib" ;; *) - mask+=" multilib" + if [[ ${MULTILIB_USE} == "yes" ]] ; then + mask+=" -multilib" + force+=" multilib" + else + mask+=" multilib" + fi ;; esac