Revert "Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a"

This reverts commit 70d91bd059869a0ecf24ceb66942ada4f66f03c9.

diff --git a/changes/bug26402 b/changes/bug26402
deleted file mode 100644 (file)
index b21283a..0000000
--- a/changes/bug26402
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-    - When linking the libtor_testing.a library, only include the dirauth
-      object files once.  Previously, they were getting added twice.
-      Fixes bug 26402; bugfix on 0.3.4.1-alpha.

diff --git a/configure.ac b/configure.ac
index fa889c152e97bc7bf24e827e435dc8bb9ceb61bf..48ca5bae1404fc3025e76e694888e5628c235d77 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2274,7 +2274,6 @@ AC_CONFIG_FILES([
         src/config/torrc.sample
         src/config/torrc.minimal
         src/rust/.cargo/config
-        src/rust/build.rs
         scripts/maint/checkOptionDocs.pl
         scripts/maint/updateVersions.pl
 ])

diff --git a/src/or/include.am b/src/or/include.am
index 33d76eebd3c6c187da1ac0e1a3ffbee006794f6b..0e2aac4aae08fcd2e9a02258a2e8529fa7c067e9 100644 (file)
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -131,7 +131,7 @@ endif
 
 src_or_libtor_a_SOURCES = $(LIBTOR_A_SOURCES)
 if UNITTESTS_ENABLED
-src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
+src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES) $(MODULE_DIRAUTH_SOURCES)
 else
 src_or_libtor_testing_a_SOURCES =
 endif

diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml
index 9d302ee3ba85e00b1b4b22cc47d03609416de822..c0c5e7bf93c57b7b54c06dfa86ff0b315d0b70d6 100644 (file)
--- a/src/rust/crypto/Cargo.toml
+++ b/src/rust/crypto/Cargo.toml
@@ -4,7 +4,6 @@ authors = ["The Tor Project",
 name = "crypto"
 version = "0.0.1"
 publish = false
-build = "../build.rs"
 
 [lib]
 name = "crypto"
@@ -27,3 +26,4 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false }
 
 [features]
 testing = ["tor_log/testing"]
+

diff --git a/src/test/include.am b/src/test/include.am
index 8b61e35204a6911bcff3c1a9fab57071ce07fe2a..2ae598b224c1f133ee782dcb31b1651518958ed8 100644 (file)
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -347,7 +347,7 @@ src_test_test_bt_cl_LDADD = src/common/libor-testing.a \
        src/trace/libor-trace.a \
        $(rust_ldadd) \
        @TOR_LIB_MATH@ \
-       @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@
+       @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ 
 src_test_test_bt_cl_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS) $(TEST_CPPFLAGS)
 
@@ -375,5 +375,5 @@ EXTRA_DIST += \
        src/test/test_workqueue_pipe2.sh \
        src/test/test_workqueue_socketpair.sh
 
-test-rust: src/rust/build.rs
+test-rust:
        $(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"