Skip to content

Commit

Permalink
For clang-cl, separate flags/options from input file to avoid `-Wslas…
Browse files Browse the repository at this point in the history
…h-u-filename`. (#513)

This avoids a `clang-cl` issue common when cross-compiling from macOS
to Windows: the `-Wslash-u-filename` where a `/Users/...` path is
interpreted as the `cl.exe` flag `/U`.

Not all compilers recognize `--` so this is limited to `clang-cl`.

There are no existing tests mocking out `clang-cl` and surface efforts
didn't succeed, so that will have to wait for follow-up.
  • Loading branch information
ncalexan committed Jun 10, 2020
1 parent 7859697 commit 4468df2
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/lib.rs
Expand Up @@ -1171,6 +1171,13 @@ impl Build {
if !msvc || !is_asm || !is_arm {
cmd.arg("-c");
}
if compiler.family == (ToolFamily::Msvc { clang_cl: true }) {
// #513: For `clang-cl`, separate flags/options from the input file.
// When cross-compiling macOS -> Windows, this avoids interpreting
// common `/Users/...` paths as the `/U` flag and triggering
// `-Wslash-u-filename` warning.
cmd.arg("--");
}
cmd.arg(&obj.src);

run(&mut cmd, &name)?;
Expand Down
16 changes: 16 additions & 0 deletions tests/test.rs
Expand Up @@ -343,6 +343,14 @@ fn gnu_static() {
test.cmd(0).must_have("-static").must_not_have("-shared");
}

#[test]
fn gnu_no_dash_dash() {
let test = Test::gnu();
test.gcc().file("foo.c").compile("foo");

test.cmd(0).must_not_have("--");
}

#[test]
fn msvc_smoke() {
reset_env();
Expand Down Expand Up @@ -411,3 +419,11 @@ fn msvc_no_static_crt() {

test.cmd(0).must_have("-MD");
}

#[test]
fn msvc_no_dash_dash() {
let test = Test::msvc();
test.gcc().file("foo.c").compile("foo");

test.cmd(0).must_not_have("--");
}

0 comments on commit 4468df2

Please sign in to comment.