diff options
| author | Romain Geissler <romain.geissler@amadeus.com> | 2023-02-05 13:56:34 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2023-02-06 10:31:26 +1030 |
| commit | 023b960d59c25994da233ea371deb26105fbacc8 (patch) | |
| tree | f20b2312fa657346359c04561762819072b423ed /ld | |
| parent | f6d5083f592a5bdc644f831304e8a5136231fe3b (diff) | |
| download | binutils-gdb-023b960d59c25994da233ea371deb26105fbacc8.tar.gz | |
[PR 30082] Pass $JANSSON_LIBS and $ZSTD_LIBS to ld-bootstrap/bootrap.exp
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/Makefile.am | 1 | ||||
| -rw-r--r-- | ld/Makefile.in | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-bootstrap/bootstrap.exp | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index bfc24537a01..760225c5b88 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -994,6 +994,7 @@ check-DEJAGNU: site.exp CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \ SFRAMELIB="$(TESTSFRAMELIB)" \ + JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \ LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \ DO_COMPARE="`echo '$(do_compare)' | sed -e 's,\\$$,,g'`" \ $(RUNTESTFLAGS); \ diff --git a/ld/Makefile.in b/ld/Makefile.in index d201a58bd72..d4dddf2f629 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2648,6 +2648,7 @@ check-DEJAGNU: site.exp CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \ SFRAMELIB="$(TESTSFRAMELIB)" \ + JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \ LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \ DO_COMPARE="`echo '$(do_compare)' | sed -e 's,\\$$,,g'`" \ $(RUNTESTFLAGS); \ diff --git a/ld/testsuite/ld-bootstrap/bootstrap.exp b/ld/testsuite/ld-bootstrap/bootstrap.exp index 7e95ddd76e9..b189a0c7098 100644 --- a/ld/testsuite/ld-bootstrap/bootstrap.exp +++ b/ld/testsuite/ld-bootstrap/bootstrap.exp @@ -162,13 +162,13 @@ foreach flags $test_flags { } if { [lindex [remote_exec build grep "-q \"HAVE_ZSTD 1\" config.h" ] 0] == 0 } then { - set extralibs "$extralibs -lzstd" + set extralibs "$extralibs $ZSTD_LIBS" } # Check if the system's jansson library is used. If so, the object files will # be using symbols from it, so link to it. if { [lindex [remote_exec build grep "-q \"HAVE_JANSSON 1\" config.h" ] 0] == 0 } then { - set extralibs "$extralibs -ljansson" + set extralibs "$extralibs $JANSSON_LIBS" } # Plugin support requires linking with libdl. |