[PR 30082] Pass $JANSSON_LIBS and $ZSTD_LIBS to ld-bootstrap/bootrap.exp

diff --git a/ld/Makefile.am b/ld/Makefile.am
index bfc24537a0177f4b31a36ecfb25e88e8a7fe7020..760225c5b884f014ad074dd320fac91d11c86cc3 100644 (file)
--- 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 d201a58bd7231db6e422ab2ffecd31557bd2cdbf..d4dddf2f6295b06c9e43a0bc323917317ebae762 100644 (file)
--- 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 7e95ddd76e946d93b456236087107e75052ecd13..b189a0c7098b2a0118a22a6e9f1c80760adc3151 100644 (file)
--- 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.