diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:47:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-19 08:47:18 -0400 |
| commit | 69ef94820b29500d93a8f2775764b8b96284bacb (patch) | |
| tree | 1337215f718c30da8cc8d1529c5a3a890e488316 /src/or/include.am | |
| parent | 92d335b3dcd7b302d8a07c105f9fe8a98848cad3 (diff) | |
| parent | 70c067102b7d2576fa456d2872bb41abf559dff6 (diff) | |
| download | tor-69ef94820b29500d93a8f2775764b8b96284bacb.tar.gz tor-69ef94820b29500d93a8f2775764b8b96284bacb.zip | |
Merge branch 'add_rust_squashed'
Diffstat (limited to 'src/or/include.am')
| -rw-r--r-- | src/or/include.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/include.am b/src/or/include.am index 7b031f737b..1ef5afa013 100644 --- a/src/or/include.am +++ b/src/or/include.am @@ -124,7 +124,8 @@ src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a \ src/trace/libor-trace.a \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ - @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \ + $(rust_ldadd) if COVERAGE_ENABLED src_or_tor_cov_SOURCES = src/or/tor_main.c |