summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2017-04-29 09:15:14 +0200
committerNick Mathewson <nickm@torproject.org>2017-05-19 08:47:10 -0400
commitf8ef7c65d10ccd9403d9d64ceceba0dd74d6421f (patch)
treeba8345086b45682c3f0e586cf7f58db22fa9dbb0 /Makefile.am
parent915fa39d0f927712f7a468c0a2f4497aef0a3b0f (diff)
downloadtor-f8ef7c65d10ccd9403d9d64ceceba0dd74d6421f.tar.gz
tor-f8ef7c65d10ccd9403d9d64ceceba0dd74d6421f.zip
Add some Rust utility functions and print support
This gives an indication in the log that Tor was built with Rust support, as well as laying some groundwork for further string-returning APIs to be converted to Rust
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index b8aa049da1..be4140aa0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT)
endif
if USE_RUST
-rust_ldadd=
+rust_ldadd=$(top_builddir)/src/rust/target/release/libtor_util.a
else
rust_ldadd=
endif
@@ -236,3 +236,6 @@ mostlyclean-local:
rm -rf $(HTML_COVER_DIR)
rm -rf $(top_builddir)/doc/doxygen
rm -rf $(TEST_NETWORK_ALL_LOG_DIR)
+
+clean-local:
+ rm -rf $(top_builddir)/src/rust/target