Add -- for files in try_expand (like in #514)#911
Merged
NobodyXu merged 2 commits intorust-lang:mainfrom Dec 18, 2023
pashokitsme:fix-try-expand
Merged
Add -- for files in try_expand (like in #514)#911NobodyXu merged 2 commits intorust-lang:mainfrom pashokitsme:fix-try-expand
-- for files in try_expand (like in #514)#911NobodyXu merged 2 commits intorust-lang:mainfrom
pashokitsme:fix-try-expand
Conversation
NobodyXu
reviewed
Dec 15, 2023
| .find_map(AsmFileExt::from_path) | ||
| .is_some(); | ||
|
|
||
| if compiler.family == (ToolFamily::Msvc { clang_cl: true }) && !is_asm { |
Contributor
There was a problem hiding this comment.
Sorry but I do wonder why !is_asm is needed here?
Contributor
Author
Contributor
There was a problem hiding this comment.
#747 uses is_assembler_msvc instead of just. is_assembler though:
let msvc = target.contains("msvc");
let is_assembler_msvc = msvc && asm_ext == Some(AsmFileExt::DotAsm);So it will add -- as long as the target is not msvc, not sure which version is better.
IMO if compiler.family is msvc clang-ci then it's probably a MSVC target.
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
2 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.
Hi!
This PR is very similar with #514 (issue: #513), but for
try_expandI've faced with that issue when i tried to cross-compile
macos -> wincrate with buildscript that usesembed-resourcevia cargo-xwin.For more context: rust-cross/cargo-xwin#86