From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id cA5uInWIomFdbQAAWB0awg (envelope-from ) for ; Sat, 27 Nov 2021 14:35:17 -0500 Received: by simark.ca (Postfix, from userid 112) id 887C61F0CE; Sat, 27 Nov 2021 14:35:17 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (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 simark.ca (Postfix) with ESMTPS id 72D441F0CC for ; Sat, 27 Nov 2021 14:35:07 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BAF753857C5E for ; Sat, 27 Nov 2021 19:35:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAF753857C5E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1638041706; bh=j0bnUR1i6lkbWIyXh8Z70I+55LBb8CBmBQiEPFB4o+8=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=hIe/raVfeajtJIdvJ72VfXOL+XRcC6a3L7bijunZH2pvS6cebhAJi9Ih09qmipzcO BrTEM29LUtRbvb1C4YhIv3xFY3xHpJmzDu0M2t2LrByD3UY7dAQ8MSxCyYTTVJAgg/ UTbgyMCL2woaGRgZQ+WX7c4//ld0P4osR4AlYQjE= Received: from barracuda.ebox.ca (barracuda.ebox.ca [96.127.255.19]) by sourceware.org (Postfix) with ESMTPS id 80D773858C3A for ; Sat, 27 Nov 2021 19:34:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 80D773858C3A X-ASG-Debug-ID: 1638041661-0c856e2e4733e480001-fS2M51 Received: from smtp.ebox.ca (smtp.ebox.ca [96.127.255.82]) by barracuda.ebox.ca with ESMTP id Gg2GjQstoehpz4cJ (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 27 Nov 2021 14:34:21 -0500 (EST) X-Barracuda-Envelope-From: simon.marchi@polymtl.ca X-Barracuda-RBL-Trusted-Forwarder: 96.127.255.82 Received: from simark.localdomain (192-222-157-6.qc.cable.ebox.net [192.222.157.6]) by smtp.ebox.ca (Postfix) with ESMTP id EE868441B21; Sat, 27 Nov 2021 14:34:20 -0500 (EST) X-Barracuda-RBL-IP: 192.222.157.6 X-Barracuda-Effective-Source-IP: 192-222-157-6.qc.cable.ebox.net[192.222.157.6] X-Barracuda-Apparent-Source-IP: 192.222.157.6 To: gdb-patches@sourceware.org Subject: [pushed] gdb: fix typos in configure Date: Sat, 27 Nov 2021 14:34:20 -0500 X-ASG-Orig-Subj: [pushed] gdb: fix typos in configure Message-Id: <20211127193420.722886-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Barracuda-Connect: smtp.ebox.ca[96.127.255.82] X-Barracuda-Start-Time: 1638041661 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://96.127.255.19:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at ebox.ca X-Barracuda-Scan-Msg-Size: 2334 X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=8.0 tests=BSF_RULE_7582B X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.94246 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE_7582B Custom Rule 7582B 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: , From: Simon Marchi via Gdb-patches Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" The variable names used to restore CFLAGS and LDFLAGS here don't quite match the names used above, resulting in losing the original CFLAGS and LDFLAGS. Fix that. Change-Id: I9cc2c3b48b1dc30c31a7143563c893fd6f426a0a --- gdb/configure | 8 ++++---- gdb/configure.ac | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/configure b/gdb/configure index 90c1e3d7948b..448167f3c6d9 100755 --- a/gdb/configure +++ b/gdb/configure @@ -12138,8 +12138,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $srchigh_pkg_cflags" LDFLAGS="$LDFLAGS $srchigh_pkg_libs" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12163,8 +12163,8 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" + CFLAGS="$save_CFLAGS" + LDFLAGS="$save_LDFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/gdb/configure.ac b/gdb/configure.ac index 29c1c4589c95..ada937316d73 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1265,8 +1265,8 @@ either use --disable-source-highlight or dnl # This situation can occur for instance when using a source highlight # library compiled with g++ 7.5.0 while building gdb with g++ 4.8.5. AC_LANG_PUSH(C++) - save_CFLAGS=$CFLAGS - save_LDFLAGS=$LDFLAGS + save_CFLAGS="$CFLAGS" + save_LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS $srchigh_pkg_cflags" LDFLAGS="$LDFLAGS $srchigh_pkg_libs" AC_LINK_IFELSE( @@ -1278,8 +1278,8 @@ either use --disable-source-highlight or dnl [have_usable_source_highlight=yes], [have_usable_source_highlight=no] ) - CFLAGS="$SAVE_CFLAGS" - LDFLAGS="$SAVE_LDFLAGS" + CFLAGS="$save_CFLAGS" + LDFLAGS="$save_LDFLAGS" AC_LANG_POP(C++) if test "${have_usable_source_highlight}" = "yes"; then -- 2.33.1