diff options
| author | Ties Stuij <ties@stuij.se> | 2017-08-10 01:08:41 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-21 15:08:24 -0400 |
| commit | 2e99f839e97e2b5b1e99abdb9a8673380c87ae18 (patch) | |
| tree | 41cce07bc13c706c4e94d0332b82fb702cef24f5 /scripts/codegen | |
| parent | 8f8a061b0c4724adebb4af1d5ac3edb7381269d5 (diff) | |
| download | tor-2e99f839e97e2b5b1e99abdb9a8673380c87ae18.tar.gz tor-2e99f839e97e2b5b1e99abdb9a8673380c87ae18.zip | |
22839: Build tor with rust enabled on win
- make tor_util static library name configurable
- fix Rust libary dependency order for Windows
Diffstat (limited to 'scripts/codegen')
| -rwxr-xr-x | scripts/codegen/fuzzing_include_am.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/codegen/fuzzing_include_am.py b/scripts/codegen/fuzzing_include_am.py index 6e45c21926..045d0f8922 100755 --- a/scripts/codegen/fuzzing_include_am.py +++ b/scripts/codegen/fuzzing_include_am.py @@ -30,13 +30,14 @@ FUZZING_LIBS = \ src/common/libor-ctime-testing.a \ src/common/libor-event-testing.a \ src/trunnel/libor-trunnel-testing.a \ + $(rust_ldadd) \ @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ @TOR_LIBEVENT_LIBS@ \ - @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ + @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ \ @TOR_SYSTEMD_LIBS@ \ @TOR_LZMA_LIBS@ \ - @TOR_ZSTD_LIBS@ \ - $(rust_ldadd) + @TOR_ZSTD_LIBS@ oss-fuzz-prereqs: \ src/or/libtor-testing.a \ |