From 65a549794309f266d34d3301e12b63bf1d5b9768 Mon Sep 17 00:00:00 2001
From: Chris Denton <ChrisDenton@users.noreply.github.com>
Date: Tue, 8 Nov 2022 21:27:35 +0000
Subject: [PATCH] Revert "For non-MSVC, separate flags/options from the input
 file. (#513)"

---
 src/lib.rs    |  7 -------
 tests/test.rs | 16 ----------------
 2 files changed, 23 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index c4269869..c309d5eb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1345,13 +1345,6 @@ impl Build {
         if self.cuda && self.files.len() > 1 {
             cmd.arg("--device-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);
         if cfg!(target_os = "macos") {
             self.fix_env_for_apple_os(&mut cmd)?;
diff --git a/tests/test.rs b/tests/test.rs
index 35ef8757..3c9b4dc4 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -343,14 +343,6 @@ 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();
@@ -419,11 +411,3 @@ 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("--");
-}