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/common/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/common/include.am')
| -rw-r--r-- | src/common/include.am | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am index 51b7da65f5..1253888815 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -100,6 +100,11 @@ LIBOR_A_SRC = \ $(threads_impl_source) \ $(readpassphrase_source) +if USE_RUST +else +LIBOR_A_SRC += src/common/compat_rust.c +endif + src/common/src_common_libor_testing_a-log.$(OBJEXT) \ src/common/log.$(OBJEXT): micro-revision.i @@ -147,6 +152,7 @@ COMMONHEADERS = \ src/common/compat.h \ src/common/compat_libevent.h \ src/common/compat_openssl.h \ + src/common/compat_rust.h \ src/common/compat_threads.h \ src/common/compat_time.h \ src/common/compress.h \ |