[tor-commits] [tor/master] Fix linker errors when building Tor.

[nickm@xxxxxxxxxxxxxx]

commit e309aa4c8c49eb683a6f192d555d4614c849c71d
Author: Alexander Færøy <ahf@xxxxxxxxxxxxxx>
Date:   Tue Jun 19 23:10:12 2018 +0200

    Fix linker errors when building Tor.
    
    This patch fixes linking errors when compiling Tor with the dirauth
    module disabled.
    
    See: https://bugs.torproject.org/26418
---
 src/or/include.am | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/or/include.am b/src/or/include.am
index 33d76eebd..59d593a5e 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -116,8 +116,9 @@ LIBTOR_A_SOURCES = \
 # Modules are conditionnally compiled in tor starting here. We add the C files
 # only if the modules has been enabled at configure time. We always add the
 # source files of every module to libtor-testing.a so we can build the unit
-# tests for everything.
+# tests for everything. See the UNITTESTS_ENABLED branch below.
 #
+LIBTOR_TESTING_A_SOURCES = $(LIBTOR_A_SOURCES)
 
 # The Directory Authority module.
 MODULE_DIRAUTH_SOURCES = \
@@ -131,7 +132,11 @@ endif
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
 if UNITTESTS_ENABLED
-src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
+
+# Add the sources of the modules that are needed for tests to work here.
+LIBTOR_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
+
+src_or_libtor_testing_a_SOURCES = $(LIBTOR_TESTING_A_SOURCES)
 else
 src_or_libtor_testing_a_SOURCES =
 endif



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits