Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an option to use vendored libgit2 #52

Merged
merged 4 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cargo-show-asm"
version = "0.1.20"
version = "0.1.21"
edition = "2021"
description = "A cargo subcommand that displays the generated assembly of Rust source code."
categories = ["development-tools::cargo-plugins", "development-tools::debugging" ]
Expand All @@ -15,6 +15,7 @@ license = "MIT OR Apache-2.0"
anyhow = "1"
bpaf = { version = "0.6", features = ["bpaf_derive"] }
cargo = "0.65"
git2 = { version = "0.14.2", optional = true } # same version as used by cargo
glob = "0.3"
line-span = "0.1"
nom = "7"
Expand All @@ -29,6 +30,7 @@ nix = { version = "0.25", default-features = false, features = ["signal"] }

[features]
vendored-openssl = ["cargo/vendored-openssl"]
vendored-libgit2 = ["git2/vendored-libgit2"]

[[bin]]
name = "cargo-asm"
Expand Down
6 changes: 6 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
# Change Log

## [0.1.21] - 2022-09-29
- options for vendored libgit2 and openssl
- documentation improvements
Thanks to @dtolnay, @matthiasbeyer and @saethlin

## [0.1.20] - 2022-09-24
- Update cargo version to 0.65
- Bump bpaf
Thanks to @elichai

## [0.1.19] - 2022-09-23
- detect missing sources and suggest to install them
Expand Down
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ $ cargo asm --lib Debug

* `cargo-show-asm` also supports MIR (note that the formatting of human-readable MIR is not stable).

# I'm on MacOS and `cargo-show-asm` fails to compile for me

In case you encounter a problem with openssl and libgit - you can try enabling one or both:
```console
cargo install cargo-show-asm --features vendored-openssl,vendored-libgit2

```

# License
This project is licensed under either of

Expand Down