fix(ci): even more robust LLVM detection in setup_llvm_windows.ps1

Author: ProgrammerKR

scripts/setup_llvm_windows.ps1

@@ -8,23 +8,53 @@ function Resolve-LLVMLayout {
     if ($env:LLVM_ROOT -and (Test-Path $env:LLVM_ROOT)) { $candidateRoots.Add($env:LLVM_ROOT) }
     if ($env:LLVM_DIR -and (Test-Path $env:LLVM_DIR)) {
         $dir = $env:LLVM_DIR
+        $candidateRoots.Add($dir)
+        # Try to backtrack to root if LLVM_DIR points to cmake dir
         $candidateRoots.Add((Split-Path (Split-Path (Split-Path $dir)))) # lib/cmake/llvm -> root
         $candidateRoots.Add((Split-Path (Split-Path $dir)))              # cmake -> root
     }
 
-    # 2. Check known paths for llvm-config.exe explicitly
-    $llvmConfigPaths = @(
-        "C:\LLVM\bin\llvm-config.exe",
-        "C:\Program Files\LLVM\bin\llvm-config.exe",
-        "C:\ProgramData\chocolatey\lib\llvm\tools\llvm\bin\llvm-config.exe"
+    # 2. Check known paths for llvm-config.exe or clang.exe explicitly
+    $checkFiles = @(
+        "bin\llvm-config.exe",
+        "bin\clang.exe",
+        "bin\lld.exe"
     )
-    foreach ($p in $llvmConfigPaths) {
-        if (Test-Path $p) {
-            Write-Host "Found llvm-config at: $p"
-            $root = Split-Path (Split-Path $p)
-            $cmakeDir = & $p --cmakedir 2>$null
-            if ($cmakeDir -and (Test-Path $cmakeDir)) {
-                return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = Join-Path $root "bin" }
+    $searchBases = @(
+        "C:\LLVM",
+        "C:\Program Files\LLVM",
+        "C:\ProgramData\chocolatey\lib\llvm\tools\llvm",
+        "C:\tools\llvm"
+    )
+    
+    foreach ($base in $searchBases) {
+        if (-not (Test-Path $base)) { continue }
+        foreach ($file in $checkFiles) {
+            $p = Join-Path $base $file
+            if (Test-Path $p) {
+                Write-Host "Found LLVM component at: $p"
+                $root = $base
+                $binDir = Join-Path $root "bin"
+                
+                # Try to find cmake dir via llvm-config if it exists
+                if ($p -like "*llvm-config.exe") {
+                    $cmakeDir = & $p --cmakedir 2>$null
+                    if ($cmakeDir -and (Test-Path $cmakeDir)) {
+                        return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = $binDir }
+                    }
+                }
+                
+                # Otherwise search for LLVMConfig.cmake in this root
+                $cmakeSuffixes = @("lib\cmake\llvm", "lib\llvm\cmake", "share\llvm\cmake", "cmake", "lib\cmake", "share\cmake\llvm")
+                foreach ($suffix in $cmakeSuffixes) {
+                    $cmakeDir = Join-Path $root $suffix
+                    if (Test-Path (Join-Path $cmakeDir "LLVMConfig.cmake")) {
+                        return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = $binDir }
+                    }
+                    if (Test-Path (Join-Path $cmakeDir "llvm-config.cmake")) {
+                        return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = $binDir }
+                    }
+                }
             }
         }
     }
@@ -40,58 +70,37 @@ function Resolve-LLVMLayout {
         }
     }
 
-    # 4. Known installation paths with suffix search
+    # 4. Aggressive search for LLVMConfig.cmake or llvm-config.cmake in candidate roots
     $candidateRoots.Add("C:\LLVM")
     $candidateRoots.Add("C:\Program Files\LLVM")
-    $candidateRoots.Add("C:\Program Files (x86)\LLVM")
-    $candidateRoots.Add("C:\ProgramData\chocolatey\lib\llvm\tools\llvm")
-    $candidateRoots.Add("C:\tools\llvm")
-    
-    $cmakeSuffixes = @("lib\cmake\llvm", "lib\llvm\cmake", "share\llvm\cmake", "cmake", "lib\cmake")
-    $uniqueRoots = $candidateRoots | Where-Object { $_ -ne $null -and $_ -ne "" } | Select-Object -Unique
+    $candidateRoots.Add("C:\ProgramData\chocolatey")
 
+    $uniqueRoots = $candidateRoots | Where-Object { $_ -ne $null -and $_ -ne "" -and (Test-Path $_) } | Select-Object -Unique
     foreach ($root in $uniqueRoots) {
-        if (-not (Test-Path $root)) { continue }
-        Write-Host "Checking LLVM root candidate: $root"
-        foreach ($suffix in $cmakeSuffixes) {
-            $cmakeDir = Join-Path $root $suffix
-            if (Test-Path (Join-Path $cmakeDir "LLVMConfig.cmake")) {
-                return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = Join-Path $root "bin" }
-            }
-        }
-    }
-
-    # 5. Deep exhaustive search in C:\LLVM specifically
-    if (Test-Path "C:\LLVM") {
-        Write-Host "Performing deep search in C:\LLVM..."
-        $configFile = Get-ChildItem -Path "C:\LLVM" -Filter "LLVMConfig.cmake" -Recurse -Depth 10 -ErrorAction SilentlyContinue | Select-Object -First 1
-        if ($configFile) {
-            $cmakeDir = $configFile.DirectoryName
-            $root = "C:\LLVM"
-            return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = Join-Path $root "bin" }
+        Write-Host "Aggressively searching for LLVM CMake files in: $root"
+        $configFile = Get-ChildItem -Path $root -Filter "*LLVMConfig.cmake" -Recurse -Depth 10 -ErrorAction SilentlyContinue | Select-Object -First 1
+        if (-not $configFile) {
+            $configFile = Get-ChildItem -Path $root -Filter "*llvm-config.cmake" -Recurse -Depth 10 -ErrorAction SilentlyContinue | Select-Object -First 1
         }
-    }
-
-    # 6. Fallback: Recursive search in common areas
-    Write-Host "Performing exhaustive search for LLVMConfig.cmake (Depth 8)..."
-    $searchRoots = @("C:\Program Files", "C:\Program Files (x86)", "C:\ProgramData\chocolatey", "C:\tools")
-    foreach ($sr in $searchRoots) {
-        if (-not (Test-Path $sr)) { continue }
-        $configFile = Get-ChildItem -Path $sr -Filter "LLVMConfig.cmake" -Recurse -Depth 8 -ErrorAction SilentlyContinue | Select-Object -First 1
+        
         if ($configFile) {
             $cmakeDir = $configFile.DirectoryName
-            Write-Host "Found LLVMConfig.cmake at: $cmakeDir"
-            $root = $cmakeDir
+            Write-Host "Found config file at: $($configFile.FullName)"
+            # Try to find root by looking for 'bin' up the tree
+            $current = $cmakeDir
             for ($i = 0; $i -lt 5; $i++) {
-                if (Test-Path (Join-Path $root "bin")) { 
-                    return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = Join-Path $root "bin" }
+                if (Test-Path (Join-Path $current "bin")) {
+                    return @{ Root = $current; CMakeDir = $cmakeDir; BinDir = Join-Path $current "bin" }
                 }
-                $parent = Split-Path -Parent $root
-                if ($parent -eq $root) { break }
-                $root = $parent
+                $parent = Split-Path $current -Parent
+                if ($parent -eq $current) { break }
+                $current = $parent
             }
+            # Fallback to current if bin not found
+            return @{ Root = $root; CMakeDir = $cmakeDir; BinDir = Join-Path $root "bin" }
         }
     }
+
     return $null
 }
 
@@ -146,6 +155,18 @@ if ($layout) {
         if (Test-Path $dp) {
             Write-Host "`nContents of $dp`:"
             Get-ChildItem $dp -ErrorAction SilentlyContinue | Select-Object Name, Mode | Format-Table -HideTableHeaders
+            
+            $binPath = Join-Path $dp "bin"
+            if (Test-Path $binPath) {
+                Write-Host "`nContents of $binPath` (first 10 items):"
+                Get-ChildItem $binPath -ErrorAction SilentlyContinue | Select-Object Name | Select-Object -First 10 | Format-Table -HideTableHeaders
+            }
+            
+            $libPath = Join-Path $dp "lib"
+            if (Test-Path $libPath) {
+                Write-Host "`nContents of $libPath` (first 10 items):"
+                Get-ChildItem $libPath -ErrorAction SilentlyContinue | Select-Object Name | Select-Object -First 10 | Format-Table -HideTableHeaders
+            }
         }
     }
     Write-Error "Failed to detect LLVM after installation."