diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-03-11 09:53:25 -0500 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2016-04-12 02:48:46 +0000 |
| commit | 1a065cea46a9c179d64d74d012f051135bc4725a (patch) | |
| tree | 8cd44edd9e10591c3d4efc8e6ff086086b21ecdd | |
| parent | ad4ff7a5b93a9236b6084548798815540ad91cbe (diff) | |
| download | tor-1a065cea46a9c179d64d74d012f051135bc4725a.tar.gz tor-1a065cea46a9c179d64d74d012f051135bc4725a.zip | |
Do not link tests against both libor.a and libor-testing.a
Also, put libor-testing.a at a better position in the list of
libraries, to avoid linker errors.
This is a fix, or part of a fix, for 18490.
Conflicts:
src/test/include.am
| -rw-r--r-- | changes/build18490 | 4 | ||||
| -rw-r--r-- | src/test/include.am | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/changes/build18490 b/changes/build18490 new file mode 100644 index 0000000000..466a133cb2 --- /dev/null +++ b/changes/build18490 @@ -0,0 +1,4 @@ + o Minor bugfixes (build): + - Do not link the unit tests against both the testing and non-testing + versions of the static libraries. Fixes bug 18490; bugfix on + 0.2.7.1-alpha. diff --git a/src/test/include.am b/src/test/include.am index 7a02a4e2f2..9e0d5528a2 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -128,9 +128,12 @@ src_test_test_workqueue_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_test_test_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ @TOR_LDFLAGS_libevent@ -src_test_test_LDADD = src/or/libtor-testing.a src/common/libor-testing.a \ - src/common/libor-crypto-testing.a $(LIBDONNA) src/common/libor.a \ - src/common/libor-event-testing.a src/trunnel/libor-trunnel-testing.a \ +src_test_test_LDADD = src/or/libtor-testing.a \ + src/common/libor-crypto-testing.a \ + $(LIBDONNA) \ + src/common/libor-testing.a \ + src/common/libor-event-testing.a \ + src/trunnel/libor-trunnel-testing.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ |