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

Refactor and extend FindRust.cmake #1145

Conversation

shutton
Copy link
Contributor

@shutton shutton commented Jan 18, 2024

Export additional build context to Rust-based builds, and eliminate some of the duplicated logic when bulding a macOS univeral binary.

@shutton shutton marked this pull request as draft January 18, 2024 18:26
@micahsnyder
Copy link
Contributor

@shutton looks like your PR branch was started from an older commit and conflicts with the FindRust.cmake from the latest in main. Perhaps your fork is out of sync. You'll have to rebase with the upstream main and resolve the conflicts.

@shutton shutton force-pushed the refactor-cmake-findrust branch from 0afeab5 to 862b1ef Compare January 18, 2024 18:29
@micahsnyder
Copy link
Contributor

Ha! You fixed it a literal second after I wrote that. Nice.

@shutton shutton marked this pull request as ready for review January 18, 2024 19:32
@shutton shutton requested a review from micahsnyder January 18, 2024 19:32
@shutton shutton self-assigned this Jan 18, 2024
@shutton shutton changed the base branch from main to feature/integrate-clamav-sys January 22, 2024 17:34
cmake/FindRust.cmake Outdated Show resolved Hide resolved
cmake/FindRust.cmake Outdated Show resolved Hide resolved
cmake/FindRust.cmake Outdated Show resolved Hide resolved
cmake/FindRust.cmake Show resolved Hide resolved
cmake/FindRust.cmake Outdated Show resolved Hide resolved
cmake/FindRust.cmake Show resolved Hide resolved
cmake/FindRust.cmake Show resolved Hide resolved
@shutton shutton force-pushed the refactor-cmake-findrust branch from 89a4530 to d3f2a76 Compare January 23, 2024 23:43
Export additional build context to Rust-based builds, and eliminate some of the
duplicated logic when bulding a macOS univeral binary.
@shutton shutton force-pushed the refactor-cmake-findrust branch from d3f2a76 to 2df7d5c Compare January 23, 2024 23:56
@micahsnyder micahsnyder changed the base branch from feature/integrate-clamav-sys to main January 24, 2024 00:03
@micahsnyder micahsnyder changed the base branch from main to feature/integrate-clamav-sys January 24, 2024 00:04
@micahsnyder micahsnyder merged commit 248717f into Cisco-Talos:feature/integrate-clamav-sys Jan 24, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants