Windows again

Author: LegNeato

tests/compiletests/src/main.rs

@@ -451,11 +451,18 @@ fn setup_windows_dll_path(codegen_backend_path: &Path) {
         let separator = ";";
 
         let dir_str = dir.to_string_lossy();
-        // Check if the directory is already in the path
-        if !existing_path
-            .split(separator)
-            .any(|p| p == dir_str.as_ref())
-        {
+
+        // Windows paths can have different case and still be the same
+        // Also check with canonicalized paths
+        let dir_canonical = dir.canonicalize().ok();
+        let already_exists = existing_path.split(separator).any(|p| {
+            let p_lower = p.to_lowercase();
+            let dir_lower = dir_str.to_lowercase();
+            p_lower == dir_lower
+                || (dir_canonical.is_some() && Path::new(p).canonicalize().ok() == dir_canonical)
+        });
+
+        if !already_exists {
             let new_path = if existing_path.is_empty() {
                 dir_str.to_string()
             } else {
@@ -471,6 +478,27 @@ fn setup_windows_dll_path(codegen_backend_path: &Path) {
     // Add the directory containing the codegen backend
     if let Some(dir) = codegen_backend_path.parent() {
         add_to_dylib_path(dir);
+
+        // On Windows, check if LLVM DLLs were copied to the build directory
+        println!("Checking for LLVM DLLs in build directory...");
+        if let Ok(entries) = std::fs::read_dir(dir) {
+            let mut found_llvm_dlls = Vec::new();
+            for entry in entries.flatten() {
+                if let Some(name) = entry.file_name().to_str() {
+                    if name.ends_with(".dll") && name.starts_with("LLVM") {
+                        found_llvm_dlls.push(name.to_string());
+                    }
+                }
+            }
+            if !found_llvm_dlls.is_empty() {
+                println!("  Found LLVM DLLs in build directory:");
+                for dll in &found_llvm_dlls {
+                    println!("    - {dll}");
+                }
+            } else {
+                println!("  No LLVM DLLs found in build directory");
+            }
+        }
     }
 
     // Try to find LLVM directories and add them to PATH
@@ -519,19 +547,67 @@ fn setup_windows_dll_path(codegen_backend_path: &Path) {
         "C:\\Program Files (x86)\\LLVM\\bin",
         "C:\\Tools\\LLVM\\bin",
         "C:\\llvm\\bin",
+        "C:\\Program Files\\LLVM-7.0.0\\bin",
+        "C:\\Program Files\\LLVM-7\\bin",
+        "C:\\LLVM-7.0.0\\bin",
     ];
 
     for path_str in &common_llvm_paths {
         let path = Path::new(path_str);
         if path.exists() {
             println!("  Found LLVM directory: {}", path_str);
             add_to_dylib_path(path);
+
+            // Also check if there's a lib directory with DLLs
+            if let Some(parent) = path.parent() {
+                let lib_path = parent.join("lib");
+                if lib_path.exists() {
+                    println!("  Also checking lib directory: {}", lib_path.display());
+                    // List DLLs in lib directory
+                    if let Ok(entries) = std::fs::read_dir(&lib_path) {
+                        let mut found_dlls = false;
+                        for entry in entries.flatten() {
+                            if let Some(name) = entry.file_name().to_str() {
+                                if name.ends_with(".dll") && name.contains("LLVM") {
+                                    if !found_dlls {
+                                        println!("  Found LLVM DLLs in lib:");
+                                        found_dlls = true;
+                                    }
+                                    println!("    - {}", name);
+                                }
+                            }
+                        }
+                        if found_dlls {
+                            add_to_dylib_path(&lib_path);
+                        }
+                    }
+                }
+            }
         }
     }
 
     // Print final PATH for debugging
     let final_path = env::var(dylib_path_envvar()).unwrap_or_default();
     println!("Final PATH: {}", final_path);
+
+    // Try to use dumpbin to check what DLLs are needed
+    println!("\nChecking DLL dependencies...");
+    let dumpbin_result = Command::new("dumpbin")
+        .args(["/dependents", codegen_backend_path.to_str().unwrap()])
+        .output();
+
+    if let Ok(output) = dumpbin_result {
+        if output.status.success() {
+            if let Ok(stdout) = String::from_utf8(output.stdout) {
+                println!("Dependencies of rustc_codegen_nvvm.dll:");
+                for line in stdout.lines() {
+                    if line.contains(".dll") && !line.contains("Dump of file") {
+                        println!("  {}", line.trim());
+                    }
+                }
+            }
+        }
+    }
 }
 
 fn find_rustc_codegen_nvvm(workspace_root: &Path) -> PathBuf {