From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 158C23858421; Mon, 6 Feb 2023 14:23:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 158C23858421 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675693438; bh=9s576Gw3F7Dguq5M6/bZOrDVR3mUDAtGxLE/NzvmeQs=; h=From:To:Subject:Date:From; b=ozSKlytxPqB3UYLd3wIeNSLyoyvzzx0bnGcQoiEESwxEHW/BsryUIbA2XbWT5qzBK 5vPYsSSsSqI3gZzHzWpJN0EzVnMdB5zqFjB5E4MaaI8WUwEcrgiJxyAE6zoesFj4nG wVIpTZT0ssUROuV/gCK/1A1zfJKcO88XOJuC/G84= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5712] libstdc++: Disable building additional archives for freestanding X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 4a910708fa24f5fe01d3cad51d5afe09db9dd2b2 X-Git-Newrev: fb8e29a5fd9cee09110a3a70c2b3645670ab65ee Message-Id: <20230206142358.158C23858421@sourceware.org> Date: Mon, 6 Feb 2023 14:23:58 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fb8e29a5fd9cee09110a3a70c2b3645670ab65ee commit r13-5712-gfb8e29a5fd9cee09110a3a70c2b3645670ab65ee Author: Jonathan Wakely Date: Sat Feb 4 00:28:24 2023 +0000 libstdc++: Disable building additional archives for freestanding This doesn't have any effect yet as we never build anything under libstdc++-v3/src for freestanding, but that will change in the next commit. libstdc++-v3/ChangeLog: * src/Makefile.am [GLIBCXX_HOSTED] (SUBDIRS): Do not add filesystem, libbacktrace and experimental. * src/Makefile.in: Regenerate. Diff: --- libstdc++-v3/src/Makefile.am | 10 +++++++++- libstdc++-v3/src/Makefile.in | 14 +++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 53fc3d0a987..97a5363b40a 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -22,6 +22,7 @@ include $(top_srcdir)/fragment.am +if GLIBCXX_HOSTED if ENABLE_FILESYSTEM_TS filesystem_dir = filesystem else @@ -34,8 +35,15 @@ else backtrace_dir = endif +experimental_dir = experimental +else +filesystem_dir = +backtrace_dir = +experimental_dir = +endif + ## Keep this list sync'd with acinclude.m4:GLIBCXX_CONFIGURE. -SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) experimental +SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) $(experimental_dir) # Cross compiler support. if VTV_CYGMIN diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index c556d0dee1b..e38b70df9fb 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -482,11 +482,15 @@ WARN_CXXFLAGS = \ # -I/-D flags to pass when compiling. AM_CPPFLAGS = $(GLIBCXX_INCLUDES) $(CPPFLAGS) -@ENABLE_FILESYSTEM_TS_FALSE@filesystem_dir = -@ENABLE_FILESYSTEM_TS_TRUE@filesystem_dir = filesystem -@ENABLE_BACKTRACE_FALSE@backtrace_dir = -@ENABLE_BACKTRACE_TRUE@backtrace_dir = libbacktrace -SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) experimental +@ENABLE_FILESYSTEM_TS_FALSE@@GLIBCXX_HOSTED_TRUE@filesystem_dir = +@ENABLE_FILESYSTEM_TS_TRUE@@GLIBCXX_HOSTED_TRUE@filesystem_dir = filesystem +@GLIBCXX_HOSTED_FALSE@filesystem_dir = +@ENABLE_BACKTRACE_FALSE@@GLIBCXX_HOSTED_TRUE@backtrace_dir = +@ENABLE_BACKTRACE_TRUE@@GLIBCXX_HOSTED_TRUE@backtrace_dir = libbacktrace +@GLIBCXX_HOSTED_FALSE@backtrace_dir = +@GLIBCXX_HOSTED_FALSE@experimental_dir = +@GLIBCXX_HOSTED_TRUE@experimental_dir = experimental +SUBDIRS = c++98 c++11 c++17 c++20 $(filesystem_dir) $(backtrace_dir) $(experimental_dir) @VTV_CYGMIN_FALSE@toolexeclib_LTLIBRARIES = libstdc++.la # Cross compiler support.