nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not link tests against both libor.a and libor-testing.a

Browse Source 
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
This commit is contained in:
Nick Mathewson 2016-03-11 09:53:25 -05:00 committed by Andrea Shepard
parent ad4ff7a5b9
commit 1a065cea46
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/build18490 Normal file
View File

@ -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.

9
src/test/include.am
View File

@ -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@