Add new include search path folder for no-cmake build because of upstream AWS-LC change #2324#792
Merged
torben-hansen merged 1 commit intoaws:mainfrom Apr 28, 2025
Merged
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #792 +/- ##
==========================================
- Coverage 95.80% 92.90% -2.90%
==========================================
Files 61 71 +10
Lines 8143 9717 +1574
Branches 0 9717 +9717
==========================================
+ Hits 7801 9028 +1227
- Misses 342 421 +79
- Partials 0 268 +268 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
justsmth
approved these changes
Apr 28, 2025
skmcgrail
approved these changes
Apr 28, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes:
aws/aws-lc#2324 implements a new import method for s2n-bignum upstream in AWS-LC. Among other things it introduces a new folder structure. This messes with assumptions for the aws-lc-rs prefix build, when not using cmake. aws-lc-rs has hard assumptions on the folder structure to add the correct include search paths.
Now s2n-bignum source in upstream AWS-LC is located under
third_party/s2n-bignum/s2n-bignum-imported. Notethird_party/s2-bignumcontains the AWS-LC-specific header files. Hence we keep the existing search path.This part of the prefix build of aws-lc-rs is quite brittle. But I can't really come up with any ideas that would resolve that easily.
Testing:
Tested locally using https://github.com/aws/aws-lc/blob/main/.github/workflows/aws-lc-rs.yml:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.