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

bindings: ensure CFLAGS includes come after libcrypto includes #4338

Merged
merged 4 commits into from
Dec 21, 2023

Conversation

WesleyRosenblum
Copy link
Contributor

@WesleyRosenblum WesleyRosenblum commented Dec 20, 2023

Description of changes:

The cc crate used for compiling the rust bindings will automatically add all flags and includes from the CFLAGS environment variable in the build command, ahead of any other includes that are explicitly specified. This can result in conflicts if the includes in CFLAGS should come after the libcrypto includes. This change prepends the libcrypto includes to the CFLAGS env variable to ensure they are considered first when compiling.

Call-outs

The same things is true for C++ flags (CXXFLAGS), do we need to account for that as well?

Testing:

Tested locally

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@github-actions github-actions bot added the s2n-core team label Dec 20, 2023
@goatgoose goatgoose self-requested a review December 21, 2023 20:06
@WesleyRosenblum WesleyRosenblum merged commit 3478c90 into main Dec 21, 2023
30 of 31 checks passed
@WesleyRosenblum WesleyRosenblum deleted the includeorder branch December 21, 2023 22:19
dougch pushed a commit to dougch/s2n-tls that referenced this pull request Jan 17, 2024
)

* bindings: ensure CFLAGS includes come after libcrypto includes

* Prepend cflags
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants