Nix/Darwin NativePaths: Nix ignore -F flags and .tbl files #19880
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
kubkon
requested changes
May 10, 2024
lib/std/zig/system/NativePaths.zig
Outdated
| @@ -33,6 +33,10 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths { | |||
| break; | |||
| }; | |||
| try self.addFrameworkDir(framework_path); | |||
| } else if (mem.startsWith(u8, word, "-F")) { | |||
| // Ignore this argument. | |||
| // Nix provides the same framework path through -iframework | |||
There was a problem hiding this comment.
There is no harm in including duplicated paths, and it's strictly safer than outright ignoring -F arg. What if suddenly the sets are disjoint between everything passed via -iframework and -F?
There was a problem hiding this comment.
Valid point. I updated the PR to include that path instead of ignore it
lib/std/zig/system/NativePaths.zig
Outdated
| @@ -67,6 +71,8 @@ pub fn detect(arena: Allocator, native_target: std.Target) !NativePaths { | |||
| try self.addRPath(lib_path); | |||
| } else if (mem.startsWith(u8, word, "-l")) { | |||
| // Ignore this argument. | |||
| } else if (mem.endsWith(u8, word, ".tbd")) { | |||
| // Ignore this argument. | |||
There was a problem hiding this comment.
This should not be ignored, and actually handled in the linker. tbd is a textualised format for a dylib on macOS and skipping those may result in unexpected link failures.
SkamDart
force-pushed
the
skamdart/nix-darwin-ignore-flags
branch
from
8ca42c7
to
9c6d2fb
Compare
SkamDart
force-pushed
the
skamdart/nix-darwin-ignore-flags
branch
from
9c6d2fb
to
e27972b
Compare
|
@kubkon - Thanks for the review. I addressed your comments and rebased. |
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.
Suggested fix for #19879