Update nixpkgs_cc_configure to work without nix_file or nix_content
#334
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
z8v
force-pushed
the
attr-path
branch
2 times, most recently
from
01a523c
to
f5b838b
Compare
benradf
reviewed
Feb 21, 2023
toolchains/cc/cc.bzl
Outdated
| "--argstr", | ||
| "ccType", | ||
| "ccTypeExpression", | ||
| "--arg", |
There was a problem hiding this comment.
Perhaps this would be a bit simpler?
@@ -388,17 +388,11 @@ def nixpkgs_cc_configure(
nix_file_deps.append(nix_file)
elif nix_file_content:
nix_expr = nix_file_content
-
- if attribute_path and nix_expr == None:
- nixopts.extend([
- "--argstr",
- "ccType",
- "ccTypeExpression",
- "--arg",
- "ccExpr",
- "(import <nixpkgs> {{}}).{0}".format(attribute_path),
- ])
elif attribute_path:
+ nix_expr = "(import <nixpkgs> {{}}).{0}".format(attribute_path)
+ attribute_path = None
+
+ if attribute_path:
nixopts.extend([
"--argstr",
"ccType",
I think it's equivalent but the logic is a little convoluted so I may be wrong.
There was a problem hiding this comment.
Not sure how to make a GitHub suggested change that I've seen people do sometimes but I made a commit.
(Edit: apparently you can't add suggestions on deleted lines 😞)
There was a problem hiding this comment.
Thanks for the suggestion! I've added the change.
benradf
approved these changes
Feb 21, 2023
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.
The simple example for the cc toolchain was updated to showcase the usage. I'm not sure if this should have a separate test altogether.
Related issue: #328