pass compile environment into build script #426
Merged
Conversation
This file contains 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
damienmg
approved these changes
Oct 14, 2020
cargo/cargo_build_script.bzl
Outdated
| @@ -52,6 +52,8 @@ def _cargo_build_script_run(ctx, script): | |||
| # Pull in env vars which may be required for the cc_toolchain to work (e.g. on OSX, the SDK version). | |||
| # We hope that the linker env is sufficient for the whole cc_toolchain. | |||
| cc_toolchain, feature_configuration = get_cc_toolchain(ctx) | |||
| cc_env = get_cc_compile_env(cc_toolchain, feature_configuration) | |||
| env.update(**cc_env) | |||
There was a problem hiding this comment.
I am not sure either this is the best solution but I think we are better with it than without.
Suggested change
| env.update(**cc_env) | |
| # TODO: Trim down the list of environment shipped. | |
| env.update(**cc_env) |
There was a problem hiding this comment.
If you'd prefer to keep env changes to a minimum, it seems as if INCLUDE is sufficient for the CC-using crates in my project to compile:
diff --git a/cargo/cargo_build_script.bzl b/cargo/cargo_build_script.bzl
index 0725c4c..a13826b 100644
--- a/cargo/cargo_build_script.bzl
+++ b/cargo/cargo_build_script.bzl
@@ -53,7 +53,9 @@ def _cargo_build_script_run(ctx, script):
# We hope that the linker env is sufficient for the whole cc_toolchain.
cc_toolchain, feature_configuration = get_cc_toolchain(ctx)
cc_env = get_cc_compile_env(cc_toolchain, feature_configuration)
- env.update(**cc_env)
+ includes = cc_env.get("INCLUDE")
+ if includes:
+ env["INCLUDE"] = includes
_, _, linker_env = get_linker_and_args(ctx, cc_toolchain, feature_configuration, None)
env.update(**linker_env)Would you like me to push this change?
There was a problem hiding this comment.
I've tentatively made this change and rebased on master.
On Windows, MSVC requires INCLUDE to be set to the path of the standard include files. Not sure if this is the best solution, but it seems to allow a build to proceed in my case.
damienmg
approved these changes
Oct 15, 2020
|
Thanks that's perfect like this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
On Windows, MSVC requires INCLUDE to be set to the path of the standard
include files. Not sure if this is the best solution, but it solved issues with
missing includes mentioned in #423 for me.