[tor-commits] [tor/master] Make the rust tests link.

[nickm@xxxxxxxxxxxxxx]

commit 99beed152e5df41181703645a67fe10a98225d55
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jul 18 10:40:52 2018 -0400

    Make the rust tests link.
---
 config.rust.in    | 2 ++
 src/rust/build.rs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/config.rust.in b/config.rust.in
index 4ca5351ae..11b671b98 100644
--- a/config.rust.in
+++ b/config.rust.in
@@ -5,6 +5,7 @@
 
 BUILDDIR=@BUILDDIR@
 TOR_LDFLAGS_zlib=@TOR_LDFLAGS_zlib@
+TOR_LDFLAGS_nss=@TOR_LDFLAGS_nss@
 TOR_LDFLAGS_openssl=@TOR_LDFLAGS_openssl@
 TOR_LDFLAGS_libevent=@TOR_LDFLAGS_libevent@
 TOR_ZLIB_LIBS=@TOR_ZLIB_LIBS@
@@ -20,3 +21,4 @@ TOR_LZMA_LIBS=@TOR_LZMA_LIBS@
 TOR_ZSTD_LIBS=@TOR_ZSTD_LIBS@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@
+NSS_LIBS=@NSS_LIBS@
\ No newline at end of file
diff --git a/src/rust/build.rs b/src/rust/build.rs
index 2cf85b404..a35e6868c 100644
--- a/src/rust/build.rs
+++ b/src/rust/build.rs
@@ -173,6 +173,7 @@ pub fn main() {
 
             cfg.from_cflags("TOR_ZLIB_LIBS");
             cfg.from_cflags("TOR_LIB_MATH");
+            cfg.from_cflags("NSS_LIBS");
             cfg.from_cflags("TOR_OPENSSL_LIBS");
             cfg.from_cflags("TOR_LIBEVENT_LIBS");
             cfg.from_cflags("TOR_LIB_WS32");



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