Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / stepmake / stepmake / test-vars.make

diff --git a/stepmake/stepmake/test-vars.make b/stepmake/stepmake/test-vars.make
index ffabc1bd2997de0a5d730ccd805186609e14a68c..b7feb78a1410b628c64dc93b0b1f4b3f584ba910 100644 (file)
--- a/stepmake/stepmake/test-vars.make
+++ b/stepmake/stepmake/test-vars.make
@@ -2,4 +2,6 @@ TEST_O_FILES := $(filter $(outdir)/test%, $(O_FILES))
 O_FILES := $(filter-out $(outdir)/test%, $(O_FILES))
 
 TEST_EXECUTABLE = $(outdir)/test-$(NAME)
-TEST_LOADLIBES = $(LOADLIBES) -lboost_unit_test_framework
+TEST_MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(TEST_MODULE_LIBS)))
+
+TEST_LOADLIBES = $(TEST_MODULE_LIBES) $(LOADLIBES) $(CXXABI_LIBS)