diff options
| -rw-r--r-- | xmake/toolchains/emcc/xmake.lua | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/xmake/toolchains/emcc/xmake.lua b/xmake/toolchains/emcc/xmake.lua index ac132a4e2..5084b6071 100644 --- a/xmake/toolchains/emcc/xmake.lua +++ b/xmake/toolchains/emcc/xmake.lua @@ -36,15 +36,14 @@ toolchain("emcc") on_check(function (toolchain) import("lib.detect.find_tool") + import("detect.sdks.find_emsdk") for _, package in ipairs(toolchain:packages()) do local installdir = package:installdir() if installdir and os.isdir(installdir) then - local sdkdir = installdir - local bindir = path.join(sdkdir, "upstream/emscripten") - local emcc = find_tool("emcc", {force = true, paths = bindir}) - if emcc then - toolchain:config_set("bindir", bindir) - toolchain:config_set("sdkdir", sdkdir) + local emsdk = find_emsdk(installdir) + if emsdk then + toolchain:config_set("bindir", emsdk.emscripten) + toolchain:config_set("sdkdir", emsdk.sdkdir) toolchain:configs_save() return emcc end |