diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2023-02-04 00:28:24 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2023-02-06 14:23:38 +0000 |
| commit | fb8e29a5fd9cee09110a3a70c2b3645670ab65ee (patch) | |
| tree | 5bbb134b204aebaa5200556a67714168c61ce4ff | |
| parent | 4a910708fa24f5fe01d3cad51d5afe09db9dd2b2 (diff) | |
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.
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 10 | ||||
| -rw-r--r-- | 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. |