-
Notifications
You must be signed in to change notification settings - Fork 52
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
20240728 vendored tss #531
base: main
Are you sure you want to change the base?
Conversation
Could you pull out the serde fixes out of this PR. They would be easier to get reviewed and approved. |
@Superhepper #538 pulled them out here. |
Signed-off-by: Thomas Epperson <[email protected]>
Update bundled documentation and include macos support Signed-off-by: William Brown <[email protected]>
92cc874
to
2763ce4
Compare
@@ -9,11 +9,21 @@ fn main() { | |||
|
|||
cfg_if::cfg_if! { | |||
if #[cfg(feature = "generate-bindings")] { | |||
#[cfg(feature = "bundled")] | |||
let installation = tpm2_tss::Installation::bundled(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit stumped about how the linking and bundling is supposed to be achieved in this branch. For the else
below I can see that the call to pkg_config
leads to them being statically linked, but here the output_linker_arguments
is 1) not "bundled"-specific, and 2) it links dynamically to those libraries. Seems that the work to prepare the libs is done, but the linking isn't?
Maybe we're just missing another conditional on cfg(feature = "bundled")
to call output_linker_arguments
vs pkg_config
.
I have tried to run this locally on my Windows 11 machine with Visual Studio 2022 and I cannot get It crashes on line 44 in the msbuild crate where it tries to run unwrap on a None value. |
This builds on #523 to improve the README as well as improving the autoconf handling for bundled tpm2-tss.