diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-30 09:15:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-30 09:15:39 -0400 |
| commit | 028523c801606301fe744eee462a55efeda385ec (patch) | |
| tree | 643303501d889e1a3285efedd75098d91f533e63 /Makefile.am | |
| parent | 57155d38a3c71e352c083b0e0c3a2326c3181c8d (diff) | |
| parent | e042727cf02fbeb0dd193f5faa60f7caf1f19aea (diff) | |
| download | tor-028523c801606301fe744eee462a55efeda385ec.tar.gz tor-028523c801606301fe744eee462a55efeda385ec.zip | |
Merge branch 'maint-0.3.4'
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 8fa6f9970f..d1c52b0f52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,8 +31,9 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \ - @TOR_RUST_EXTRA_LIBS@ +## this MUST be $(), otherwise am__DEPENDENCIES will not track it +rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) \ + $(TOR_RUST_EXTRA_LIBS) else rust_ldadd= endif |