Rollup merge of #121194 - beetrees:rustc-raw-args, r=petrochenkov

Refactor pre-getopts command line argument handling

Rebased version of #111658. I've also fixed the Windows CI failure (although I don't have access to Windows to test it myself).

1 files changed, 1 insertions, 1 deletions

diff --git a/src/driver.rs b/src/driver.rs
index 8fc66644632..9e42abbc9aa 100644
--- a/src/driver.rs
+++ b/src/driver.rs
@@ -190,7 +190,7 @@ pub fn main() {
     });
 
     exit(rustc_driver::catch_with_exit_code(move || {
-        let mut orig_args: Vec<String> = env::args().collect();
+        let mut orig_args = rustc_driver::args::raw_args(&early_dcx)?;
 
         let has_sysroot_arg = |args: &mut [String]| -> bool {
             if arg_value(args, "--sysroot", |_| true).is_some() {