commit e06a0e904cdc80566147a3d718366abe7dd8929d
Merge: c54f4b81da 2a3cf37450
Author: David Goulet <[email protected]>
Date: Thu Jan 21 16:07:16 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
.gitignore | 3 +++
Makefile.am | 14 ++++++++++++++
changes/ticket40227 | 4 ++++
scripts/maint/gen_ccls_file.sh | 20 ++++++++++++++++++++
4 files changed, 41 insertions(+)
diff --cc Makefile.am
index 6e8ba37e3a,a723c167ef..3056b08446
--- a/Makefile.am
+++ b/Makefile.am
@@@ -721,7 -702,21 +721,21 @@@ show-distdir-core
file $(distdir)/_build/core; fi
show-libs:
- @echo $(TOR_INTERNAL_LIBS)
+ @echo libtor.a
show-testing-libs:
- @echo $(TOR_INTERNAL_TESTING_LIBS)
+ @echo src/test/libtor-testing.a
+
+ # Note here that we hardcode this -j2 because if the user would pass too many
+ # cores, bear actually chockes and dies :S. For this to work, a make clean
+ # needs to be done else bear will miss some compile flags.
+ lsp:
+ @if test -x "`which bear 2>&1;true`"; then \
+ echo "Generating LSP compile_commands.json. Might take few
minutes..."; \
+ $(MAKE) clean 2>&1 >/dev/null; \
+ bear >/dev/null 2>&1 -- $(MAKE) -j2 2>&1 >/dev/null; \
+ echo "Generating .ccls file..."; \
+ ./scripts/maint/gen_ccls_file.sh \
+ else \
+ echo "No bear command found. On debian, apt install bear"; \
+ fi
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
