From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id FSr9FnctzGCpQAAAWB0awg (envelope-from ) for ; Fri, 18 Jun 2021 01:21:59 -0400 Received: by simark.ca (Postfix, from userid 112) id 5000F1F163; Fri, 18 Jun 2021 01:21:59 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.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 3BDAB1E01F for ; Fri, 18 Jun 2021 01:21:55 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 87E163889836 for ; Fri, 18 Jun 2021 05:21:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87E163889836 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623993714; bh=XzrMVlYhzZQhohNbWZbpEhDwtv82ShkUwGzyX7dIW8A=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=Bxo+Hvtxy4R6F3RbUhsw1eIYFfUPIJTskzulCrlEE5FdYIYv3HhIBbgtp6zVH2k5G 5su+xnW2N5TKvv+9n6KV68yP8dokn2i3SBB3VTUlFipMP3g9w4Z/Lwhf7iq7eAJBOn HjSMd5cGrfHa1XbZKjoryg4I/lE0gW4tF/c9Zobc= Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id D050D3857821 for ; Fri, 18 Jun 2021 05:21:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D050D3857821 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id E0D71335C7A for ; Fri, 18 Jun 2021 05:21:29 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 1/2] sim: create a makefile fragment to pass common settings Date: Fri, 18 Jun 2021 01:21:27 -0400 Message-Id: <20210618052128.5014-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" As we merge settings from subdirs into the common configure, we sometimes need to keep the settings working in both dirs. Create a makefile fragment to pass them down so we don't have to run the checks twice. For now, the file is empty, but we'll start moving logic in shortly. --- sim/Makefile.in | 4 +++- sim/arch-subdir.mk.in | 18 ++++++++++++++++++ sim/common/Make-common.in | 3 +++ sim/configure | 3 ++- sim/configure.ac | 2 +- sim/ppc/Makefile.in | 3 +++ 6 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 sim/arch-subdir.mk.in diff --git a/sim/arch-subdir.mk.in b/sim/arch-subdir.mk.in new file mode 100644 index 000000000000..9eae1f3e4998 --- /dev/null +++ b/sim/arch-subdir.mk.in @@ -0,0 +1,18 @@ +## Fragment to pass common settings into arch subdir builds. +## NB: This should eventually be merged into sim/Makefile.am once there are no +## subdir configure scripts. +# +# Copyright (C) 1993-2021 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 7a6a2030a47b..b82e76c91f6f 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -46,6 +46,9 @@ include $(srcroot)/gdb/silent-rules.mk GNULIB_PARENT_DIR = ../.. include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc +# Settings from top-level configure. +include ../arch-subdir.mk + prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/sim/configure.ac b/sim/configure.ac index 4ba2921ebaf3..91af0bba5860 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -118,5 +118,5 @@ SIM_AC_OPTION_PROFILE SIM_AC_OPTION_STDIO SIM_AC_OPTION_TRACE -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([arch-subdir.mk Makefile]) AC_OUTPUT -- 2.31.1