From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id A8ED139A0465 for ; Fri, 4 Jun 2021 20:25:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A8ED139A0465 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id DA16C11775F; Fri, 4 Jun 2021 16:25:37 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at gnat.com Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id UgnC9l6N4Hds; Fri, 4 Jun 2021 16:25:37 -0400 (EDT) Received: from murgatroyd.Home (75-166-132-3.hlrn.qwest.net [75.166.132.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 9713D117755; Fri, 4 Jun 2021 16:25:37 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Use ACX_NONCANONICAL_TARGET in gdb/configure Date: Fri, 4 Jun 2021 14:25:15 -0600 Message-Id: <20210604202515.3429329-1-tromey@adacore.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 20:25:49 -0000 Shahab Vahedipointed out that the patch to remove gdb/testsuite/configure regressed the site.exp creation a bit -- it left an unresolved configure substitution. Andrew Burgess pointed out that the patch removed the call to ACX_NONCANONICAL_TARGET, which caused this problem. This patch adds ACX_NONCANONICAL_TARGET to gdb's configure, and fixes the bug. gdb/ChangeLog 2021-06-04 Tom Tromey * configure: Rebuild. * configure.ac: Add ACX_NONCANONICAL_TARGET. --- gdb/ChangeLog | 5 +++++ gdb/configure | 19 +++++++++++++++++++ gdb/configure.ac | 2 ++ 3 files changed, 26 insertions(+) diff --git a/gdb/configure b/gdb/configure index fb43377015c..3d3977b26a8 100755 --- a/gdb/configure +++ b/gdb/configure @@ -800,6 +800,7 @@ DEPDIR am__leading_dot CXX_DIALECT HAVE_CXX11 +target_noncanonical INSTALL_STRIP_PROGRAM STRIP install_sh @@ -5186,6 +5187,24 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Set target, target_cpu, target_vendor, and target_os. + case ${build_alias} in + "") build_noncanonical=${build} ;; + *) build_noncanonical=${build_alias} ;; +esac + + case ${host_alias} in + "") host_noncanonical=${build_noncanonical} ;; + *) host_noncanonical=${host_alias} ;; +esac + + case ${target_alias} in + "") target_noncanonical=${host_noncanonical} ;; + *) target_noncanonical=${target_alias} ;; +esac + + + + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. diff --git a/gdb/configure.ac b/gdb/configure.ac index e6e1c6b7b90..df340ffa826 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -43,6 +43,8 @@ AC_CANONICAL_HOST # Set target, target_cpu, target_vendor, and target_os. AC_CANONICAL_TARGET +ACX_NONCANONICAL_TARGET + AC_ARG_PROGRAM # We require a C++11 compiler. Check if one is available, and if -- 2.26.3