mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Remove duplicate MODULE_DIRAUTH_SOURCES from libtor_testing.a
This was already added to LIBTOR_A_SOURCES; it doesn't need to get added again. Fixes bug 26402. Bugfix on 0.3.4.1-alpha.
This commit is contained in:
@@ -0,0 +1,4 @@
|
||||
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.
|
||||
@@ -2274,6 +2274,7 @@ 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
|
||||
])
|
||||
|
||||
+1
-1
@@ -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) $(MODULE_DIRAUTH_SOURCES)
|
||||
src_or_libtor_testing_a_SOURCES = $(LIBTOR_A_SOURCES)
|
||||
else
|
||||
src_or_libtor_testing_a_SOURCES =
|
||||
endif
|
||||
|
||||
@@ -4,6 +4,7 @@ authors = ["The Tor Project",
|
||||
name = "crypto"
|
||||
version = "0.0.1"
|
||||
publish = false
|
||||
build = "../build.rs"
|
||||
|
||||
[lib]
|
||||
name = "crypto"
|
||||
@@ -26,4 +27,3 @@ rand_core = { version = "=0.2.0-pre.0", default-features = false }
|
||||
|
||||
[features]
|
||||
testing = ["tor_log/testing"]
|
||||
|
||||
|
||||
+2
-2
@@ -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:
|
||||
test-rust: src/rust/build.rs
|
||||
$(TESTS_ENVIRONMENT) "$(abs_top_srcdir)/src/test/test_rust.sh"
|
||||
|
||||
Reference in New Issue
Block a user