From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <burnus@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1534)
 id A47453952C16; Tue,  6 Oct 2020 09:54:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A47453952C16
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Tobias Burnus <burnus@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r9-8977] configure: Fix in-tree building of GMP on BSD [PR97302]
X-Act-Checkin: gcc
X-Git-Author: Tobias Burnus <tobias@codesourcery.com>
X-Git-Refname: refs/heads/releases/gcc-9
X-Git-Oldrev: 972bc5c8e40cd7a7ca285304227e9ecfec7e2868
X-Git-Newrev: 96b32c86f507f5391512a9cb5ec536e604472ea2
Message-Id: <20201006095415.A47453952C16@sourceware.org>
Date: Tue,  6 Oct 2020 09:54:15 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2020 09:54:15 -0000

https://gcc.gnu.org/g:96b32c86f507f5391512a9cb5ec536e604472ea2

commit r9-8977-g96b32c86f507f5391512a9cb5ec536e604472ea2
Author: Tobias Burnus <tobias@codesourcery.com>
Date:   Tue Oct 6 11:49:34 2020 +0200

    configure: Fix in-tree building of GMP on BSD [PR97302]
    
    ChangeLog:
            PR target/97302
            * configure.ac: Only set with_gmp to /usr/local
            if not building in tree.
            * configure: Regenerate.
    (cherry picked from commit c0d0a722da8583f74a0c192041be2f379cf487c1)

Diff:
---
 configure    | 1 +
 configure.ac | 1 +
 2 files changed, 2 insertions(+)

diff --git a/configure b/configure
index abd93a990a9..8de7fd3afc3 100755
--- a/configure
+++ b/configure
@@ -3679,6 +3679,7 @@ case "${target}" in
     ;;
   *-*-freebsd*)
     if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
+	&& ! test -d ${srcdir}/gmp \
 	&& test -f /usr/local/include/gmp.h; then
       with_gmp=/usr/local
     fi
diff --git a/configure.ac b/configure.ac
index 9db4fd14aa2..4aab1482e34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -961,6 +961,7 @@ case "${target}" in
     ;;
   *-*-freebsd*)
     if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
+	&& ! test -d ${srcdir}/gmp \
 	&& test -f /usr/local/include/gmp.h; then
       with_gmp=/usr/local
     fi