From nobody Mon Feb 9 10:00:38 2026 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1728903711; cv=none; d=zohomail.com; s=zohoarc; b=AwMru/UmQoop7m6zoAlfvtjxLHchoj6sTpmADfg9gHoDz/gjJ/s4NYrh0FPLk/Gl5KfBtg4ZMh8Ia7HtnmLNfnmVOO6oV1uTQiOvicXCR4LHsoXXRfk33E7QR1AWK2EoL7h5K5h6jeDa1AIvSBrAj8qjtcSS1R3EkaCgYKAXYmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728903711; 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=m9CyeO3qkuJqO/FP22B4AY0ImK8u2K1VZSSqjOde2/o=; b=Nvfg6wXm/QvsTm1cQ4IwX3JXa3Q1mHO+Umim3qjsV+udEPwdAxIAA0vzdJEK5wBhQ3bCe1/bZwYD/qwsOlvVJ71vJexnfmsHQj6LbL5OTwKoDFj4oiZpyn8QdPQau5YHvhuhKSbBwUYcrCeA4BHgyh7RQRNqS/loJZ4cZDl/NdU= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1728903711853110.07991503215771; Mon, 14 Oct 2024 04:01:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t0IpK-00026b-FR; Mon, 14 Oct 2024 07:01:26 -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 1t0IpH-00026B-GG for qemu-devel@nongnu.org; Mon, 14 Oct 2024 07:01:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t0IpE-0007kF-WE for qemu-devel@nongnu.org; Mon, 14 Oct 2024 07:01:23 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-480-OjRHkKUEMVGvesnJHRl7jg-1; Mon, 14 Oct 2024 07:01:19 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a9a1828916fso59199766b.1 for ; Mon, 14 Oct 2024 04:01:18 -0700 (PDT) Received: from avogadro.local ([151.81.124.37]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9a0d3e49a5sm150238866b.101.2024.10.14.04.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2024 04:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728903680; 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=m9CyeO3qkuJqO/FP22B4AY0ImK8u2K1VZSSqjOde2/o=; b=GyTJtyZnzbAtE7seWjLWy2WgX3fTCF5IGos7VPuz+pxsc8IO8zjibgaUwJp82PVUBByAcB pDTrxM8KJKToZ6e3aV28m7bly61T6cSDGQpR8XYBkh5tzX7FsMvjJ+Pdaup3FQGs+K0FUM ktAGv4bnrXpZd3G70drAJrzyc5g0ow4= X-MC-Unique: OjRHkKUEMVGvesnJHRl7jg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728903677; x=1729508477; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=m9CyeO3qkuJqO/FP22B4AY0ImK8u2K1VZSSqjOde2/o=; b=AVlQIs//Yges4jEhjdIDHiMnlYMyUuXbexNI038IC9LWyndTRKTSljCLIs8S8jr6rc kZy5y99ygYv536LaDhsyNngtB7EDOM2B4Smkm7dPkQK+NsrOkRMH5clYm2UNUU1lJFkK WbH2XBKObtJLCVVQ5+9Ok77+FTyF3y3XKmM6UpGLqit8S0FuqKp1Ze/CtsnheQM+b2Be Gg2+DhUWAnN4KZIiq3SzCZzArxOsjwHexo0P31KrI2Dq/ah7U777w0scjbBmI+3NVNMS WMtwBG7H4JoxZA1aTrzGscurtYjWChIVnX7CkxbbUZFvufhsRkdt1GoJF5yAkgcqxWjf xAkA== X-Gm-Message-State: AOJu0YzHUC3IJ8nh76oO2PTh44xzRO41qWRBJpF61e5Rm6Yg4ko25XhE Qf5EbvE3zoTp5FleTd7zH/ocOIfl4N/qfJEtGOijkjFhFDKt6JvqNO64j5SDp4Ektp5eJDbO2kc SXbIXdsJJN2J4Mle5Y036aJqdzcu4DDWUqwMmXPczzAh1MmR8Qm7AcRk4Cw/dE/yPJZK+Isb6Lb +9gMdn8v38zWTl+/ZIFS7U7A++zUmIrD6pA+/Ac24= X-Received: by 2002:a17:907:7f93:b0:a9a:170d:67b2 with SMTP id a640c23a62f3a-a9a170d6871mr153102166b.29.1728903677217; Mon, 14 Oct 2024 04:01:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHSVVipBuQSp2OfADYWs6zDGfsv4Zjk1ZVm7jIpIkmenUaVRhnZzF07PAFC3+yVwN6yNybImw== X-Received: by 2002:a17:907:7f93:b0:a9a:170d:67b2 with SMTP id a640c23a62f3a-a9a170d6871mr153097266b.29.1728903676625; Mon, 14 Oct 2024 04:01:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , Peter Maydell , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH] configure, meson: synchronize defaults for configure and Meson Rust options Date: Mon, 14 Oct 2024 13:01:13 +0200 Message-ID: <20241014110113.173946-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.076, 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_NONE=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: 1728903713105116600 If the defaults for --enable-rust ($rust in configure) and Meson's rust option are out of sync, incremental builds will pick Meson's default. This happens because, on an incremental build, configure does not run Meson, Make does instead. Meson then gets the command line options from either coredata.dat (which has everything cached in Python's pickle format) or cmd_line.txt (slow path when Meson version is upgraded), but neither knows about the rust option, and the meson_options.txt default is used. This will cause have_rust to be true if rustc is available; and the build to fail because configure did not put a RUST_TARGET_TRIPLE in config-host.m= ak. When in the Rust pull request I changed the $rust default from auto to disabled, I should have made the same change to meson_options.txt; do it now. Cc: Manos Pitsidianakis Reported-by: Peter Maydell Reported-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini Tested-by: Peter Maydell --- configure | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3e38a91616a..8a9a4153310 100755 --- a/configure +++ b/configure @@ -1987,7 +1987,7 @@ if test "$skip_meson" =3D no; then fi =20 # QEMU options - test "$rust" !=3D "auto" && meson_option_add "-Drust=3D$rust" + test "$rust" !=3D "disabled" && meson_option_add "-Drust=3D$rust" test "$cfi" !=3D false && meson_option_add "-Dcfi=3D$cfi" "-Db_lto=3D$cf= i" test "$docs" !=3D auto && meson_option_add "-Ddocs=3D$docs" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" diff --git a/meson_options.txt b/meson_options.txt index 2211f291b2d..fc6d5526d58 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -372,5 +372,5 @@ option('hexagon_idef_parser', type : 'boolean', value := true, option('x86_version', type : 'combo', choices : ['0', '1', '2', '3', '4'],= value: '1', description: 'tweak required x86_64 architecture version beyond com= piler default') =20 -option('rust', type: 'feature', value: 'auto', +option('rust', type: 'feature', value: 'disabled', description: 'Rust support') --=20 2.46.2