diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2022-01-19 14:20:52 +0000 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2022-01-19 14:23:13 +0000 |
| commit | 6a26ad67367a889a9fb6d0cc30e1e608e794d298 (patch) | |
| tree | 4ae46607efde0853bdf926b7ad13f9c2a2e11434 /libstdc++-v3/scripts | |
| parent | f4ca0a53be18dfc7162fd5dcc1e73c4203805e14 (diff) | |
| download | gcc-6a26ad67367a889a9fb6d0cc30e1e608e794d298.zip gcc-6a26ad67367a889a9fb6d0cc30e1e608e794d298.tar.gz gcc-6a26ad67367a889a9fb6d0cc30e1e608e794d298.tar.bz2 | |
libstdc++: Fix libbacktrace build files
This makes it possible to combine --enable-libstdcxx-debug with
--enable-libstdcxx-backtrace, by adding a rule to src/Makefile to copy
the backtrace-supported.h header into the src/debug/libbacktrace
directory.
Add libbacktrace path to testsuite flags so the tests can link without
having the library installed.
Also fix some warnings when running automake for the libbacktrace
makefile.
Use a per-library CPPFLAGS variable to fix:
src/libbacktrace/Makefile.am:38: warning: AM_CPPFLAGS multiply defined in condition TRUE ...
fragment.am:43: ... 'AM_CPPFLAGS' previously defined here
src/libbacktrace/Makefile.am:32: 'fragment.am' included from here
Create symlinks to the libbacktrace sources to fix:
src/libbacktrace/Makefile.am:55: warning: source file '../../../libbacktrace/atomic.c' is in a subdirectory,
src/libbacktrace/Makefile.am:55: but option 'subdir-objects' is disabled
libstdc++-v3/ChangeLog:
* scripts/testsuite_flags.in: Add src/libbacktrace/.libs to
linker search paths.
* src/Makefile.am: Fix src/debug/libbacktrace build.
* src/Makefile.in: Regenerate.
* src/libbacktrace/Makefile.am: Use per-library CPPFLAGS
variable. Use symlinks for the source files.
* src/libbacktrace/Makefile.in: Regenerate.
Diffstat (limited to 'libstdc++-v3/scripts')
| -rwxr-xr-x | libstdc++-v3/scripts/testsuite_flags.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in index cf7f0f7..40dd3d3 100755 --- a/libstdc++-v3/scripts/testsuite_flags.in +++ b/libstdc++-v3/scripts/testsuite_flags.in @@ -78,7 +78,8 @@ case ${query} in ;; --cxxldflags) SECTIONLDFLAGS="@SECTION_LDFLAGS@ @LIBICONV@ - -L${BUILD_DIR}/src/filesystem/.libs" + -L${BUILD_DIR}/src/filesystem/.libs + -L${BUILD_DIR}/src/libbacktrace/.libs" echo ${SECTIONLDFLAGS} ;; *) |