Merge pull request #7659 from ifarbod/ifarbod/fix-emcc-detectionHEADdev

refactor emcc detection to support both .exe and .bat on windows

1 files changed, 18 insertions, 1 deletions

diff --git a/xmake/modules/detect/tools/find_emxx.lua b/xmake/modules/detect/tools/find_emxx.lua
index 4f8cc90ed..6ba454d1d 100644
--- a/xmake/modules/detect/tools/find_emxx.lua
+++ b/xmake/modules/detect/tools/find_emxx.lua
@@ -50,7 +50,24 @@ function main(opt)
     end
 
     -- find program
-    local program = find_program(opt.program or (is_host("windows") and "em++.bat" or "em++"), opt)
+    -- emsdk 6.0.0+ ships .exe on windows, older releases ship .bat
+    local program
+    if opt.program then
+        program = find_program(opt.program, opt)
+    else
+        local candidate_names
+        if is_host("windows") then
+            candidate_names = {"em++.exe", "em++.bat"}
+        else
+            candidate_names = {"em++"}
+        end
+        for _, name in ipairs(candidate_names) do
+            program = find_program(name, opt)
+            if program then
+                break
+            end
+        end
+    end
 
     -- find program version
     local version = nil