From nobody Fri Nov 14 22:23:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1759844910; cv=none; d=zohomail.com; s=zohoarc; b=ifIq0LVMS3RY1/B6P4+9nXwx3bbKJTDoHKO5f3ggD1tR4t531z6pRSuUU11pFuDQxFhgn++SKrXq0UtyjUNRVlWDbTvhL2OS1adiPUhcABNJhQsS8ntEMyNPutFG/hKVeHhweTTu3us3WJJSkldy6kk+3eukfrJ19S0E7cfnXyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1759844910; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6MFlMmOdcHUaHBRUIVBEaj+CoVm9tQ/Wh3ynjBKbV1I=; b=F4VZdHtT79D6nSgwcQVdt2ixaQnr+vp7xweLyEH+TSjajwI+sfP1+QugWbYQGO+ue/Y/5ERB2V6Oz1sIq2j1AmuSqG7fCZTcKxIwz9B6PmRkD6R9A4mX6l+Wu1ig37Ns3Hit4+/YlIi3plI/2lAVLwmb7VBsPSd3PcJ/x+G5sjs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1759844910851434.6138163822051; Tue, 7 Oct 2025 06:48:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v681T-0006mB-UN; Tue, 07 Oct 2025 09:46:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v681L-0006ll-BX for qemu-devel@nongnu.org; Tue, 07 Oct 2025 09:46:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v6819-0007HZ-Ki for qemu-devel@nongnu.org; Tue, 07 Oct 2025 09:46:26 -0400 Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-669-D5cKFj1QO46ePIC2U3ZhBQ-1; Tue, 07 Oct 2025 09:46:05 -0400 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 08C8B1955F44; Tue, 7 Oct 2025 13:46:04 +0000 (UTC) Received: from localhost (unknown [10.44.22.31]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 88D721800447; Tue, 7 Oct 2025 13:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759844766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6MFlMmOdcHUaHBRUIVBEaj+CoVm9tQ/Wh3ynjBKbV1I=; b=MC1BMDk4Dtuj8zDPexgrrLAogb1+OZAx/tcTePzxljWpuaB0xItQDNEjhpqXq6XxD8hJhp Fj5mfEtNVi+eJuux2h21PdlvPzdEX7c215mWGXh6OLKcMZXm1rvCxUIfndhq+RjJOXmmlW vP8BwSrlS5Ta6817RWynkEuCS+6SZMw= X-MC-Unique: D5cKFj1QO46ePIC2U3ZhBQ-1 X-Mimecast-MFC-AGG-ID: D5cKFj1QO46ePIC2U3ZhBQ_1759844764 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, rth7680@gmail.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth Subject: [PATCH] build-sys: default to host vendor for rust target triple Date: Tue, 7 Oct 2025 17:45:58 +0400 Message-ID: <20251007134558.251670-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.422, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1759844914137154100 From: Marc-Andr=C3=A9 Lureau This fixes docker-test@alpine, which uses "alpine" vendor. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 78445cbb4b..a467f3a2e0 100755 --- a/configure +++ b/configure @@ -1216,8 +1216,9 @@ fi if test "$rust" !=3D disabled && test -z "$rust_target_triple"; then # arch and os generally matches between meson and rust rust_arch=3D$host_arch + # default to host vendor + rust_vendor=3D$(echo "$rust_host_triple" | cut -d'-' -f2) rust_os=3D$host_os - rust_machine=3Dunknown rust_osvariant=3D =20 # tweak rust_os if needed; also, machine and variant depend on the OS @@ -1225,7 +1226,7 @@ if test "$rust" !=3D disabled && test -z "$rust_targe= t_triple"; then case "$host_os" in darwin) # e.g. aarch64-apple-darwin - rust_machine=3Dapple + rust_vendor=3Dapple ;; =20 linux) @@ -1273,13 +1274,13 @@ EOF ;; =20 sunos) - rust_machine=3Dpc + rust_vendor=3Dpc rust_os=3Dsolaris ;; =20 windows) # e.g. aarch64-pc-windows-gnullvm, x86_64-pc-windows-gnu (MSVC not sup= ported) - rust_machine=3Dpc + rust_vendor=3Dpc if test "$host_arch" =3D aarch64; then rust_osvariant=3Dgnullvm else @@ -1310,7 +1311,7 @@ EOF sparc64) if test "$rust_os" =3D solaris; then rust_arch=3Dsparcv9 - rust_machine=3Dsun + rust_vendor=3Dsun fi ;; =20 @@ -1324,7 +1325,7 @@ EOF # e.g. aarch64-linux-android rust_target_triple=3D$rust_arch-$rust_os-$rust_osvariant else - rust_target_triple=3D$rust_arch-$rust_machine-$rust_os${rust_osvariant= :+-$rust_osvariant} + rust_target_triple=3D$rust_arch-$rust_vendor-$rust_os${rust_osvariant:= +-$rust_osvariant} fi fi =20 --=20 2.51.0