From 7bed6935e5098ed8596fddd433cdc93d33ad62b5 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Mon, 2 Jun 2025 13:47:47 +0200
Subject: [PATCH 01/23] Added wasm64 architecture

---
 conan/internal/default_settings.py | 2 +-
 conan/tools/gnu/get_gnu_triplet.py | 1 +
 conan/tools/meson/helpers.py       | 1 +
 conan/tools/qbs/common.py          | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index e9c974c772e..c6a378e2138 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -91,7 +91,7 @@
 arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64,
        armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, arm64ec,
        sparc, sparcv9,
-       mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le,
+       mips, mips64, avr, s390, s390x, asm.js, wasm, wasm64, sh4le,
        e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7,
        riscv64, riscv32,
        xtensalx6, xtensalx106, xtensalx7,
diff --git a/conan/tools/gnu/get_gnu_triplet.py b/conan/tools/gnu/get_gnu_triplet.py
index dc7e3b68dc7..9b5eb7a86bb 100644
--- a/conan/tools/gnu/get_gnu_triplet.py
+++ b/conan/tools/gnu/get_gnu_triplet.py
@@ -10,6 +10,7 @@ def _get_gnu_arch(os_, arch):
                "armv8.3": "aarch64",
                "asm.js": "asmjs",
                "wasm": "wasm32",
+               "wasm64": "wasm64",
                }.get(arch, None)
 
     if not machine:
diff --git a/conan/tools/meson/helpers.py b/conan/tools/meson/helpers.py
index c3e40a806d9..fcf49fd4052 100644
--- a/conan/tools/meson/helpers.py
+++ b/conan/tools/meson/helpers.py
@@ -49,6 +49,7 @@
     'sparc': ('sparc', 'sparc', 'big'),
     'sparcv9': ('sparc64', 'sparc64', 'big'),
     'wasm': ('wasm32', 'wasm32', 'little'),
+    'wasm64': ('wasm64', 'wasm64', 'little'),
     'x86': ('x86', 'x86', 'little'),
     'x86_64': ('x86_64', 'x86_64', 'little'),
     'riscv32': ('riscv32', 'riscv32', 'little'),
diff --git a/conan/tools/qbs/common.py b/conan/tools/qbs/common.py
index dd45f434e8d..bf64867044c 100644
--- a/conan/tools/qbs/common.py
+++ b/conan/tools/qbs/common.py
@@ -26,6 +26,7 @@
     's390x': 's390x',
     'asm.js': None,
     'wasm': None,
+    'wasm64': None,
     'sh4le': 'sh'
 }
 
@@ -84,4 +85,4 @@
     'MT': 'static',
     'MDd': 'dynamic',
     'MTd': 'static',
-}
\ No newline at end of file
+}

From d69df3162d0a1385bdf719815272a1333de66cef Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Mon, 2 Jun 2025 17:11:53 +0200
Subject: [PATCH 02/23] Added MEMORY64=1 on wasm64 to architecture_flag
 function

---
 conan/tools/build/flags.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conan/tools/build/flags.py b/conan/tools/build/flags.py
index 98d068252ac..ba099b13315 100644
--- a/conan/tools/build/flags.py
+++ b/conan/tools/build/flags.py
@@ -66,6 +66,10 @@ def architecture_flag(conanfile):
                 "e2k-v5": "-march=elbrus-v5",
                 "e2k-v6": "-march=elbrus-v6",
                 "e2k-v7": "-march=elbrus-v7"}.get(arch, "")
+
+    if the_os == "Emscripten" and arch == "wasm64":
+        return "-sMEMORY64=1"
+
     return ""
 
 

From fd749164663b68dda70a341d29fb35f971602307 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 4 Jun 2025 10:40:35 +0200
Subject: [PATCH 03/23] Support asm.js arch correctly

---
 conan/tools/build/flags.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/conan/tools/build/flags.py b/conan/tools/build/flags.py
index ba099b13315..f01da5ae068 100644
--- a/conan/tools/build/flags.py
+++ b/conan/tools/build/flags.py
@@ -67,9 +67,15 @@ def architecture_flag(conanfile):
                 "e2k-v6": "-march=elbrus-v6",
                 "e2k-v7": "-march=elbrus-v7"}.get(arch, "")
 
-    if the_os == "Emscripten" and arch == "wasm64":
-        return "-sMEMORY64=1"
-
+    if the_os == "Emscripten":
+        # Emscripten default output is WASM, force it for backwards compatibility
+        if arch == "wasm":
+            return "-sWASM=1"
+        elif arch == "wasm64":
+            return "-sWASM=1 -sMEMORY64=1"
+        # Deactivate WASM output forcing asm.js output instead
+        elif arch == "asm.js":
+            return "-sWASM=0"
     return ""
 
 

From f448d85ff7e4abe7f46ead5ee0d215bd2e597337 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Thu, 5 Jun 2025 18:40:05 +0200
Subject: [PATCH 04/23] Added emcc compiler support

---
 conan/internal/default_settings.py |  7 +++++++
 conan/tools/build/cppstd.py        | 14 ++++++++++++++
 conan/tools/build/cstd.py          | 16 ++++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index c6a378e2138..b0d26b2b08b 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -163,6 +163,13 @@
         version: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25"]
         libcxx: [libstdc++, libstdc++11]
         cppstd: [null, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
+    emcc:
+        # Following versions are the ones available in Conan Center Index within emsdk package.
+        # Other versions can be added by the usage of settings_user.yml
+        version: ["2.0.34", "3.0.1", "3.1.50", "3.1.73", "4.0.6", "4.0.9"]
+        libcxx: [null, libstdc++, libc++]
+        cppstd: [null, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23, 26, gnu26]
+        cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
 
 build_type: [null, Debug, Release, RelWithDebInfo, MinSizeRel]
 """
diff --git a/conan/tools/build/cppstd.py b/conan/tools/build/cppstd.py
index 43c3e9da45f..184c47ed04f 100644
--- a/conan/tools/build/cppstd.py
+++ b/conan/tools/build/cppstd.py
@@ -104,6 +104,7 @@ def supported_cppstd(conanfile, compiler=None, compiler_version=None):
             "clang": _clang_supported_cppstd,
             "mcst-lcc": _mcst_lcc_supported_cppstd,
             "qcc": _qcc_supported_cppstd,
+            "emcc": _emcc_supported_cppstd,
             }.get(compiler)
     if func:
         return func(Version(compiler_version))
@@ -267,3 +268,16 @@ def _qcc_supported_cppstd(version):
         return ["98", "gnu98"]
     else:
         return ["98", "gnu98", "11", "gnu11", "14", "gnu14", "17", "gnu17"]
+
+def _emcc_supported_cppstd(version):
+    """
+    emcc is based on clang but follow different versioning scheme.
+    """
+    if version <= "3.0.1":
+        return _clang_supported_cppstd("14")
+    if version <= "3.1.50":
+        return _clang_supported_cppstd("18")
+    if version <= "4.0.1":
+        return _clang_supported_cppstd("20")
+    # Since emcc 4.0.2 clang version is 21
+    return _clang_supported_cppstd("21")
diff --git a/conan/tools/build/cstd.py b/conan/tools/build/cstd.py
index 2a762d775ce..a819cf69468 100644
--- a/conan/tools/build/cstd.py
+++ b/conan/tools/build/cstd.py
@@ -110,6 +110,7 @@ def supported_cstd(conanfile, compiler=None, compiler_version=None):
             "gcc": _gcc_supported_cstd,
             "msvc": _msvc_supported_cstd,
             "clang": _clang_supported_cstd,
+            "emcc": _emcc_supported_cstd,
             }.get(compiler)
     if func:
         return func(Version(compiler_version))
@@ -190,3 +191,18 @@ def _clang_supported_cstd(version):
     if version < "18":
         return ["99", "gnu99", "11", "gnu11", "17", "gnu17"]
     return ["99", "gnu99", "11", "gnu11", "17", "gnu17", "23", "gnu23"]
+
+def _emcc_supported_cstd(version):
+    """
+    emcc is based on clang but follow different versioning scheme.
+    """
+    if version <= "3.0.1":
+        return _clang_supported_cstd("14")
+    if version <= "3.1.50":
+        return _clang_supported_cstd("18")
+    if version <= "4.0.1":
+        return _clang_supported_cstd("20")
+    # Since emcc 4.0.2 clang version is 21
+    return _clang_supported_cstd("21")
+
+

From e3abe875557b8ca128cfcd875501b43840f3ef9d Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Fri, 6 Jun 2025 16:29:55 +0200
Subject: [PATCH 05/23] Added emcc compiler support

---
 conan/internal/default_settings.py |  8 ++++----
 conan/tools/build/cppstd.py        |  8 ++++----
 conan/tools/build/cstd.py          |  8 ++++----
 conan/tools/build/flags.py         | 15 ++++++---------
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/conan/internal/default_settings.py b/conan/internal/default_settings.py
index b0d26b2b08b..68c19ba0baa 100644
--- a/conan/internal/default_settings.py
+++ b/conan/internal/default_settings.py
@@ -164,10 +164,10 @@
         libcxx: [libstdc++, libstdc++11]
         cppstd: [null, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
     emcc:
-        # Following versions are the ones available in Conan Center Index within emsdk package.
-        # Other versions can be added by the usage of settings_user.yml
-        version: ["2.0.34", "3.0.1", "3.1.50", "3.1.73", "4.0.6", "4.0.9"]
-        libcxx: [null, libstdc++, libc++]
+        # From https://github.com/emscripten-core/emscripten/blob/main/ChangeLog.md
+        # There is no ABI compatibility guarantee between versions
+        version: [ANY]
+        libcxx: [null, libstdc++, libstdc++11, libc++]
         cppstd: [null, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23, 26, gnu26]
         cstd: [null, 99, gnu99, 11, gnu11, 17, gnu17, 23, gnu23]
 
diff --git a/conan/tools/build/cppstd.py b/conan/tools/build/cppstd.py
index 184c47ed04f..b7c18227623 100644
--- a/conan/tools/build/cppstd.py
+++ b/conan/tools/build/cppstd.py
@@ -274,10 +274,10 @@ def _emcc_supported_cppstd(version):
     emcc is based on clang but follow different versioning scheme.
     """
     if version <= "3.0.1":
-        return _clang_supported_cppstd("14")
+        return _clang_supported_cppstd(Version("14"))
     if version <= "3.1.50":
-        return _clang_supported_cppstd("18")
+        return _clang_supported_cppstd(Version("18"))
     if version <= "4.0.1":
-        return _clang_supported_cppstd("20")
+        return _clang_supported_cppstd(Version("20"))
     # Since emcc 4.0.2 clang version is 21
-    return _clang_supported_cppstd("21")
+    return _clang_supported_cppstd(Version("21"))
diff --git a/conan/tools/build/cstd.py b/conan/tools/build/cstd.py
index a819cf69468..59e3f1145c7 100644
--- a/conan/tools/build/cstd.py
+++ b/conan/tools/build/cstd.py
@@ -197,12 +197,12 @@ def _emcc_supported_cstd(version):
     emcc is based on clang but follow different versioning scheme.
     """
     if version <= "3.0.1":
-        return _clang_supported_cstd("14")
+        return _clang_supported_cstd(Version("14"))
     if version <= "3.1.50":
-        return _clang_supported_cstd("18")
+        return _clang_supported_cstd(Version("18"))
     if version <= "4.0.1":
-        return _clang_supported_cstd("20")
+        return _clang_supported_cstd(Version("20"))
     # Since emcc 4.0.2 clang version is 21
-    return _clang_supported_cstd("21")
+    return _clang_supported_cstd(Version("21"))
 
 
diff --git a/conan/tools/build/flags.py b/conan/tools/build/flags.py
index f01da5ae068..138ea97a13f 100644
--- a/conan/tools/build/flags.py
+++ b/conan/tools/build/flags.py
@@ -66,13 +66,10 @@ def architecture_flag(conanfile):
                 "e2k-v5": "-march=elbrus-v5",
                 "e2k-v6": "-march=elbrus-v6",
                 "e2k-v7": "-march=elbrus-v7"}.get(arch, "")
-
-    if the_os == "Emscripten":
-        # Emscripten default output is WASM, force it for backwards compatibility
-        if arch == "wasm":
-            return "-sWASM=1"
-        elif arch == "wasm64":
-            return "-sWASM=1 -sMEMORY64=1"
+    elif compiler == "emcc":
+        # Emscripten default output is WASM since 1.37.x (long time ago)
+        if arch == "wasm64":
+            return "-sMEMORY64=1"
         # Deactivate WASM output forcing asm.js output instead
         elif arch == "asm.js":
             return "-sWASM=0"
@@ -88,7 +85,7 @@ def libcxx_flags(conanfile):
     if compiler == "apple-clang":
         # In apple-clang 2 only values atm are "libc++" and "libstdc++"
         lib = f'-stdlib={libcxx}'
-    elif compiler == "clang" or compiler == "intel-cc":
+    elif compiler in ("clang", "intel-cc", "emcc"):
         if libcxx == "libc++":
             lib = "-stdlib=libc++"
         elif libcxx == "libstdc++" or libcxx == "libstdc++11":
@@ -103,7 +100,7 @@ def libcxx_flags(conanfile):
     elif compiler == "qcc":
         lib = f'-Y _{libcxx}'
 
-    if compiler in ['clang', 'apple-clang', 'gcc']:
+    if compiler in ['clang', 'apple-clang', 'gcc', 'emcc']:
         if libcxx == "libstdc++":
             stdlib11 = "_GLIBCXX_USE_CXX11_ABI=0"
         elif libcxx == "libstdc++11" and conanfile.conf.get("tools.gnu:define_libcxx11_abi",

From 35b0b94ff4d63b5aa5e0a287a8a50609663600d0 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Mon, 9 Jun 2025 16:45:50 +0200
Subject: [PATCH 06/23] WIP Added functional tests

---
 .ci/docker/conan-tests                        |   3 +-
 .github/workflows/osx-tests.yml               |   4 +-
 test/conftest.py                              |   1 +
 .../toolchains/emscripten/test_emcc.py        | 173 ++++++++++++++++++
 test/unittests/tools/gnu/test_triplets.py     |   1 +
 5 files changed, 179 insertions(+), 3 deletions(-)
 create mode 100644 test/functional/toolchains/emscripten/test_emcc.py

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index ef26a5530f9..7667bc17762 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -75,7 +75,8 @@ RUN apt-get update && \
         g++-9-multilib \
         gcc-11-multilib \
         g++-11-multilib \
-        scons && \
+        scons \
+        emscripten && \
     # fix: asm/errno.h: No such file or directory
     ln -s /usr/include/asm-generic/ /usr/include/asm && \
     add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
diff --git a/.github/workflows/osx-tests.yml b/.github/workflows/osx-tests.yml
index c02a165962b..f6196ecd2c5 100644
--- a/.github/workflows/osx-tests.yml
+++ b/.github/workflows/osx-tests.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Install homebrew dependencies
         run: |
-          brew install xcodegen make libtool zlib autoconf automake ninja
+          brew install xcodegen make libtool zlib autoconf automake ninja emscripten
 
       - name: Cache CMake and Bazel installations
         id: cache-tools
@@ -168,7 +168,7 @@ jobs:
 
       - name: Install homebrew dependencies
         run: |
-          brew install xcodegen make libtool zlib autoconf automake ninja
+          brew install xcodegen make libtool zlib autoconf automake ninja emscripten
           export PATH=${HOME}/Applications/CMake/3.15.7/bin:$PATH:/usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin
           cmake --version
           bazel --version
diff --git a/test/conftest.py b/test/conftest.py
index a0f6ead5a3b..f4b4fd089ac 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -190,6 +190,7 @@
             "path": {'Linux': '/usr/share/qbs/bin'}
         }
     },
+    "emcc": {}
     # TODO: Intel oneAPI is not installed in CI yet. Uncomment this line whenever it's done.
     # "intel_oneapi": {
     #     "default": "2021.3",
diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
new file mode 100644
index 00000000000..bd3eaa00b1e
--- /dev/null
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -0,0 +1,173 @@
+# Test suite to check conan capabilities for cross compiling to web assembly and asmjs
+import textwrap
+import os
+import platform
+from shutil import rmtree
+import pytest
+
+from conan.test.utils.tools import TestClient
+
+base_emscripten_profile = textwrap.dedent(
+    """
+    [settings]
+    build_type=Release
+    compiler=emcc
+    compiler.cppstd=17
+    compiler.libcxx=libc++
+    compiler.version=4.0.10
+    os=Emscripten
+
+    [platform_tool_requires]
+    emsdk/4.0.10
+
+    [conf]
+    tools.build:exelinkflags=['-sALLOW_MEMORY_GROWTH=1']
+    tools.build:sharedlinkflags=['-sALLOW_MEMORY_GROWTH=1']
+
+    # Define the emcc executable paths
+    tools.build:compiler_executables={'c':'emcc', 'cpp':'em++'}
+
+    # Set Ninja as default generator as it is faster and will sove issues on Windows
+    tools.cmake.cmaketoolchain:generator=Ninja
+    # Verbosity to see emcc invocations
+    tools.compilation:verbosity=verbose
+    # Distinguish between architectures
+    tools.cmake.cmake_layout:build_folder_vars=['settings.build_type', 'settings.arch']
+
+    [buildenv]
+    AR=emar
+    NM=emnm
+    RANLIB=emranlib
+    STRIP=emstrip
+"""
+)
+
+wasm32_profile = textwrap.dedent(
+    """
+    include(base_emscripten_profile)
+    [settings]
+    arch=wasm
+
+    [conf]
+    tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=4GB', '-sINITIAL_MEMORY=64MB']
+    tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=4GB', '-sINITIAL_MEMORY=64MB']
+    """
+)
+
+wasm_64_profile = textwrap.dedent(
+    """
+    include(base_emscripten_profile)
+    [settings]
+    arch=wasm64
+    [conf]
+    tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=16GB', '-sINITIAL_MEMORY=16GB']
+    tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=16GB', '-sINITIAL_MEMORY=16GB']
+    """
+)
+
+
+asmjs_profile = textwrap.dedent(
+    """
+    include(base_emscripten_profile)
+    [settings]
+    arch=asm.js
+
+    [conf]
+    tools.build:exelinkflags+=['-sMAXIMUM_MEMORY=2GB', '-sINITIAL_MEMORY=64MB']
+    tools.build:sharedlinkflags+=['-sMAXIMUM_MEMORY=2GB', '-sINITIAL_MEMORY=64MB']
+    """
+)
+
+
+@pytest.mark.tool("cmake")
+@pytest.mark.tool("emcc")
+def test_cmake_emscripten():
+    client = TestClient()
+
+    client.run("new cmake_exe -d name=hello -d version=0.1")
+    client.save({"wasm32": wasm32_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
+
+    client.run("build . -pr:h=wasm32")
+    assert "em++   -stdlib=libc++ -O3 -DNDEBUG -std=c++17" in client.out
+    build_folder = "build/release-wasm" if platform.system() != "Windows" else "build"
+    assert os.path.exists(os.path.join(client.current_folder, build_folder, "hello.wasm"))
+
+    # Run JavaScript generated code which uses .wasm file
+    client.run_command("node ./build/release-wasm/hello")
+    assert "Hello World Release!" in client.out
+
+    client.run("build . -pr:h=asmjs")
+    assert "WASM=0" in client.out
+    build_folder = "build/release-asm.js" if platform.system() != "Windows" else "build"
+    # No wasm should be generated for asm.js architecture
+    assert not os.path.exists(os.path.join(client.current_folder, build_folder, "hello.wasm"))
+    client.run_command("node ./build/release-asm.js/hello")
+    assert "Hello World Release!" in client.out
+
+
+@pytest.mark.tool("meson")
+@pytest.mark.tool("emcc")
+def test_meson_emscripten():
+    client = TestClient()
+    client.run("new meson_exe -d name=hello -d version=0.1")
+
+    client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
+    client.run("build . -pr:h=wasm64")
+    assert "C++ compiler for the host machine: em++" in client.out
+    assert "C++ linker for the host machine: em++ ld.wasm" in client.out
+    assert "Host machine cpu family: wasm64" in client.out
+    assert os.path.exists(os.path.join(client.current_folder, "build", "hello.wasm"))
+    client.run_command("node ./build/hello")
+    assert "Hello World Release!" in client.out
+
+    rmtree(os.path.join(client.current_folder, "build"))
+    client.run("build . -pr:h=asmjs")
+    assert "C++ compiler for the host machine: em++" in client.out
+    assert "C++ linker for the host machine: em++ ld.wasm" in client.out
+    assert "Host machine cpu family: asm.js" in client.out
+    assert "WASM=0" in client.out
+
+    assert not os.path.exists(os.path.join(client.current_folder, "build", "hello.wasm"))
+    client.run_command("node ./build/hello")
+    assert "Hello World Release!" in client.out
+
+
+@pytest.mark.tool("autotools")
+@pytest.mark.tool("emcc")
+def test_autotools_emscripten():
+    client = TestClient(path_with_spaces=False)
+    client.run("new autotools_exe -d name=hello -d version=0.1")
+    client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
+    client.run("build . -pr:h=wasm32")
+    assert "em++  -stdlib=libc++  -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4GB -sINITIAL_MEMORY=64MB -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4GB -sINITIAL_MEMORY=64MB" in client.out
+    assert "checking for wasm32-local-emscripten-ranlib... emranlib" in client.out
+    assert "checking for wasm32-local-emscripten-gcc... emcc" in client.out
+    assert "checking for wasm32-local-emscripten-ar... emar" in client.out
+    assert "checking the archiver (emar) interface... ar" in client.out
+    assert "checking for wasm32-local-emscripten-strip... emstrip" in client.out
+
+    assert os.path.exists(os.path.join(client.current_folder, "build-release", "src", "hello.wasm"))
+    # Run JavaScript generated code which uses .wasm file
+    client.run_command("node ./build-release/src/hello")
+    assert "Hello World Release!" in client.out
+
+    rmtree(os.path.join(client.current_folder, "build-release"))
+    client.run("build . -pr:h=asmjs")
+    assert "WASM=0" in client.out
+    # No wasm should be generated for asm.js architecture
+    assert not os.path.exists(os.path.join(client.current_folder, "build-release", "hello.wasm"))
+    client.run_command("node ./build-release/src/hello")
+    assert "Hello World Release!" in client.out
+
+
+# def test_bazel_emscripten():
+#     client = TestClient(path_with_spaces=False)
+#     client.run("new bazel7_exe -d name=hello -d version=0.1")
+#     client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
+#     client.run("build . -pr:h=wasm32")
+
+# def test_msbuild_emscripten():
+#     client = TestClient(path_with_spaces=False)
+#     client.run("new msbuild_exe -d name=hello -d version=0.1")
+#     client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
+#     client.run("build . -pr:h=wasm32")
diff --git a/test/unittests/tools/gnu/test_triplets.py b/test/unittests/tools/gnu/test_triplets.py
index 62647957661..5a8998ea5bc 100644
--- a/test/unittests/tools/gnu/test_triplets.py
+++ b/test/unittests/tools/gnu/test_triplets.py
@@ -51,6 +51,7 @@
     ["tvOS", "x86_64", None, "x86_64-apple-tvos"],
     ["Emscripten", "asm.js", None, "asmjs-local-emscripten"],
     ["Emscripten", "wasm", None, "wasm32-local-emscripten"],
+    ["Emscripten", "wasm64", None, "wasm64-local-emscripten"],
     ["AIX", "ppc32", None, "rs6000-ibm-aix"],
     ["AIX", "ppc64", None, "powerpc-ibm-aix"],
     ["Neutrino", "armv7", None, "arm-nto-qnx"],

From 20551810f39483d585cd970daf66657da3d00c90 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 09:57:00 +0200
Subject: [PATCH 07/23] WIP: Added emscripten on windows

---
 .github/workflows/win-tests.yml                    | 10 ++++++++++
 test/conftest.py                                   |  3 ++-
 test/functional/toolchains/emscripten/test_emcc.py |  3 +++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index bfc3bcff231..9f90fa3aa72 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -209,6 +209,16 @@ jobs:
               Remove-Item $zipFile
           }
 
+      - name: Install emscripten SDK
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          emsdk update
+          emsdk install latest
+          emsdk activate latest
+          call emsdk_env.bat
+          emcc --version
+
       - name: Prepare environment for functional tests
         run: |
           git config --global core.autocrlf false
diff --git a/test/conftest.py b/test/conftest.py
index f4b4fd089ac..a189d4aaae7 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -190,7 +190,8 @@
             "path": {'Linux': '/usr/share/qbs/bin'}
         }
     },
-    "emcc": {}
+    "emcc": {},
+    "node": {},
     # TODO: Intel oneAPI is not installed in CI yet. Uncomment this line whenever it's done.
     # "intel_oneapi": {
     #     "default": "2021.3",
diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index bd3eaa00b1e..81b22362edd 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -81,6 +81,7 @@
 
 @pytest.mark.tool("cmake")
 @pytest.mark.tool("emcc")
+@pytest.mark.tool("node")
 def test_cmake_emscripten():
     client = TestClient()
 
@@ -107,6 +108,7 @@ def test_cmake_emscripten():
 
 @pytest.mark.tool("meson")
 @pytest.mark.tool("emcc")
+@pytest.mark.tool("node")
 def test_meson_emscripten():
     client = TestClient()
     client.run("new meson_exe -d name=hello -d version=0.1")
@@ -134,6 +136,7 @@ def test_meson_emscripten():
 
 @pytest.mark.tool("autotools")
 @pytest.mark.tool("emcc")
+@pytest.mark.tool("node")
 def test_autotools_emscripten():
     client = TestClient(path_with_spaces=False)
     client.run("new autotools_exe -d name=hello -d version=0.1")

From c739f7301e40a2fbb0fcc847427a12d7ae429153 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 10:15:09 +0200
Subject: [PATCH 08/23] WIP: Added emscripten on windows

---
 .github/workflows/win-tests.yml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 9f90fa3aa72..45afdbe75d8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -137,6 +137,15 @@ jobs:
           choco install cyg-get
           cyg-get automake gcc-g++ make binutils --verbose
 
+      - name: Install emscripten SDK
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          .\emsdk install latest
+          .\emsdk activate latest
+          .\emsdk_env.bat
+          emcc --version
+
       - uses: msys2/setup-msys2@v2
         id: msys2-setup
         with:
@@ -209,16 +218,6 @@ jobs:
               Remove-Item $zipFile
           }
 
-      - name: Install emscripten SDK
-        run: |
-          git clone https://github.com/emscripten-core/emsdk.git
-          cd emsdk
-          emsdk update
-          emsdk install latest
-          emsdk activate latest
-          call emsdk_env.bat
-          emcc --version
-
       - name: Prepare environment for functional tests
         run: |
           git config --global core.autocrlf false

From a77a98b00c2cc692fa2619f3f21938fb5e69185b Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 11:49:42 +0200
Subject: [PATCH 09/23] WIP: Added emscripten on windows

---
 .ci/docker/conan-tests          | 15 ++++++++++++---
 .github/workflows/win-tests.yml |  5 ++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index 7667bc17762..c3062bb6361 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -25,7 +25,8 @@ ENV PY36=3.6.15 \
     CLANGXX_14=/usr/bin/clang++-14 \
     BAZEL_6=6.5.0 \
     BAZEL_7=7.4.1 \
-    BAZEL_8=8.0.0
+    BAZEL_8=8.0.0 \
+    EMSDK=4.0.10
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -75,8 +76,7 @@ RUN apt-get update && \
         g++-9-multilib \
         gcc-11-multilib \
         g++-11-multilib \
-        scons \
-        emscripten && \
+        scons && \
     # fix: asm/errno.h: No such file or directory
     ln -s /usr/include/asm-generic/ /usr/include/asm && \
     add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
@@ -170,6 +170,15 @@ RUN cd /tmp && \
     mv qbs-linux-x86_64-2.6.0 /usr/share/qbs && \
     rm qbs-linux-x86_64-2.6.0.tar.gz
 
+RUN cd /tmp && \
+    wget https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK}.tar.gz && \
+    tar xzf ${EMSDK}.tar.gz && \
+    cd ${EMSDK} && \
+    ./emsdk update && \
+    ./emsdk install latest && \
+    ./emsdk activate latest --permanent && \
+    source ./emsdk_env.sh
+
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 
 USER conan
diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 45afdbe75d8..d1bc2ebd9dd 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -142,10 +142,13 @@ jobs:
           git clone https://github.com/emscripten-core/emsdk.git
           cd emsdk
           .\emsdk install latest
-          .\emsdk activate latest
+          .\emsdk activate latest --permanent
           .\emsdk_env.bat
           emcc --version
 
+      - name: test
+        run: emcc -v
+
       - uses: msys2/setup-msys2@v2
         id: msys2-setup
         with:

From 2e8ce7484e429b3b7b41887f0754dd877e45415d Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 14:39:09 +0200
Subject: [PATCH 10/23] WIP: Added emscripten on windows

---
 .ci/docker/conan-tests                        |  5 +--
 .github/workflows/win-tests.yml               | 36 ++++++++++++-------
 .../toolchains/emscripten/test_emcc.py        |  7 ++--
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index c3062bb6361..eb9da7c2b6a 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -173,11 +173,12 @@ RUN cd /tmp && \
 RUN cd /tmp && \
     wget https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK}.tar.gz && \
     tar xzf ${EMSDK}.tar.gz && \
-    cd ${EMSDK} && \
+    cd emsdk-${EMSDK} && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \
-    source ./emsdk_env.sh
+    cd .. && mv emsdk-${EMSDK} /usr/share/ && \
+    echo "source '/usr/share/emsdk-${EMSDK}/emsdk_env.sh'" > /etc/profile.d/emsdk.sh
 
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 
diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index d1bc2ebd9dd..e40025c8165 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -74,6 +74,30 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Install emscripten SDK
+        run: |
+          $version = "4.0.10"
+          $destination = "C:\tools\emsdk\$version"
+          if (-not (Test-Path $destination)) {
+              New-Item -Path $destination -ItemType Directory
+          }
+          $url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/$version.zip"
+          $zipFile = "emsdk-$version.zip"
+          Invoke-WebRequest -Uri $url -OutFile $zipFile
+          Expand-Archive -Path $zipFile -DestinationPath $destination -Force
+          Remove-Item $zipFile
+          cd emsdk-$version
+          .\emsdk install latest
+          .\emsdk activate latest --permanent
+          .\emsdk_env.ps1
+          $node = Split-Path $EMSDK_NODE
+          echo  "$node;$env:path"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
+          emcc -v
+          node --version
+
+      - name: test
+        run: emcc -v
+
       - name: Install MSVC v14.38 Toolset
         run: |
           Start-Process -Wait "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList {`
@@ -137,18 +161,6 @@ jobs:
           choco install cyg-get
           cyg-get automake gcc-g++ make binutils --verbose
 
-      - name: Install emscripten SDK
-        run: |
-          git clone https://github.com/emscripten-core/emsdk.git
-          cd emsdk
-          .\emsdk install latest
-          .\emsdk activate latest --permanent
-          .\emsdk_env.bat
-          emcc --version
-
-      - name: test
-        run: emcc -v
-
       - uses: msys2/setup-msys2@v2
         id: msys2-setup
         with:
diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index 81b22362edd..3257d9b47f8 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -163,14 +163,11 @@ def test_autotools_emscripten():
     assert "Hello World Release!" in client.out
 
 
+# TODO: need incubating bazel toolchain
 # def test_bazel_emscripten():
 #     client = TestClient(path_with_spaces=False)
 #     client.run("new bazel7_exe -d name=hello -d version=0.1")
 #     client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
 #     client.run("build . -pr:h=wasm32")
 
-# def test_msbuild_emscripten():
-#     client = TestClient(path_with_spaces=False)
-#     client.run("new msbuild_exe -d name=hello -d version=0.1")
-#     client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
-#     client.run("build . -pr:h=wasm32")
+# TODO: give support to msbuild

From 6ce7cb457eb420c8d7c4d5c24b76a4a33fb8cfeb Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 14:42:22 +0200
Subject: [PATCH 11/23] WIP: Added emscripten on windows

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index e40025c8165..2eb07bc2ed8 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -86,7 +86,7 @@ jobs:
           Invoke-WebRequest -Uri $url -OutFile $zipFile
           Expand-Archive -Path $zipFile -DestinationPath $destination -Force
           Remove-Item $zipFile
-          cd emsdk-$version
+          cd $destination
           .\emsdk install latest
           .\emsdk activate latest --permanent
           .\emsdk_env.ps1

From 534712b749e912382539ac4a3b377346859c0491 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 14:44:42 +0200
Subject: [PATCH 12/23] WIP: Added emscripten on windows

---
 .github/workflows/win-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 2eb07bc2ed8..608039fa268 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -86,7 +86,7 @@ jobs:
           Invoke-WebRequest -Uri $url -OutFile $zipFile
           Expand-Archive -Path $zipFile -DestinationPath $destination -Force
           Remove-Item $zipFile
-          cd $destination
+          cd $destination\emsdk-$version
           .\emsdk install latest
           .\emsdk activate latest --permanent
           .\emsdk_env.ps1

From 897d00e6db03acef55c42889adfd9fea91c8a9a2 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 15:32:12 +0200
Subject: [PATCH 13/23] Fix dockerfile

---
 .ci/docker/conan-tests                        |  7 +++---
 .github/workflows/win-tests.yml               | 24 -------------------
 .../toolchains/emscripten/test_emcc.py        |  3 +++
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index eb9da7c2b6a..fc5515f2d11 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -172,13 +172,12 @@ RUN cd /tmp && \
 
 RUN cd /tmp && \
     wget https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK}.tar.gz && \
-    tar xzf ${EMSDK}.tar.gz && \
-    cd emsdk-${EMSDK} && \
+    tar xzf ${EMSDK}.tar.gz --directory /usr/share/emsdk && \
+    cd /usr/share/emsdk && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \
-    cd .. && mv emsdk-${EMSDK} /usr/share/ && \
-    echo "source '/usr/share/emsdk-${EMSDK}/emsdk_env.sh'" > /etc/profile.d/emsdk.sh
+    echo "source '/usr/share/emsdk/emsdk_env.sh'" > /etc/profile.d/emsdk.sh
 
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 
diff --git a/.github/workflows/win-tests.yml b/.github/workflows/win-tests.yml
index 608039fa268..bfc3bcff231 100644
--- a/.github/workflows/win-tests.yml
+++ b/.github/workflows/win-tests.yml
@@ -74,30 +74,6 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install emscripten SDK
-        run: |
-          $version = "4.0.10"
-          $destination = "C:\tools\emsdk\$version"
-          if (-not (Test-Path $destination)) {
-              New-Item -Path $destination -ItemType Directory
-          }
-          $url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/$version.zip"
-          $zipFile = "emsdk-$version.zip"
-          Invoke-WebRequest -Uri $url -OutFile $zipFile
-          Expand-Archive -Path $zipFile -DestinationPath $destination -Force
-          Remove-Item $zipFile
-          cd $destination\emsdk-$version
-          .\emsdk install latest
-          .\emsdk activate latest --permanent
-          .\emsdk_env.ps1
-          $node = Split-Path $EMSDK_NODE
-          echo  "$node;$env:path"| Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          emcc -v
-          node --version
-
-      - name: test
-        run: emcc -v
-
       - name: Install MSVC v14.38 Toolset
         run: |
           Start-Process -Wait "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList {`
diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index 3257d9b47f8..eed139ce15a 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -82,6 +82,7 @@
 @pytest.mark.tool("cmake")
 @pytest.mark.tool("emcc")
 @pytest.mark.tool("node")
+@pytest.mark.skipif(platform.system() == "Windows", reason = "Emscripten not installed in Windows")
 def test_cmake_emscripten():
     client = TestClient()
 
@@ -109,6 +110,7 @@ def test_cmake_emscripten():
 @pytest.mark.tool("meson")
 @pytest.mark.tool("emcc")
 @pytest.mark.tool("node")
+@pytest.mark.skipif(platform.system() == "Windows", reason = "Emscripten not installed in Windows")
 def test_meson_emscripten():
     client = TestClient()
     client.run("new meson_exe -d name=hello -d version=0.1")
@@ -137,6 +139,7 @@ def test_meson_emscripten():
 @pytest.mark.tool("autotools")
 @pytest.mark.tool("emcc")
 @pytest.mark.tool("node")
+@pytest.mark.skipif(platform.system() == "Windows", reason = "Emscripten not installed in Windows")
 def test_autotools_emscripten():
     client = TestClient(path_with_spaces=False)
     client.run("new autotools_exe -d name=hello -d version=0.1")

From a7b9ae1b7913598e422c8662185873f3e6a5a515 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 15:51:28 +0200
Subject: [PATCH 14/23] Fix dockerfile

---
 .ci/docker/conan-tests | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index fc5515f2d11..c484212dae0 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -172,12 +172,12 @@ RUN cd /tmp && \
 
 RUN cd /tmp && \
     wget https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK}.tar.gz && \
-    tar xzf ${EMSDK}.tar.gz --directory /usr/share/emsdk && \
-    cd /usr/share/emsdk && \
+    tar xzf ${EMSDK}.tar.gz --directory /usr/share && \
+    cd /usr/share/emsdk-${EMSDK} && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \
-    echo "source '/usr/share/emsdk/emsdk_env.sh'" > /etc/profile.d/emsdk.sh
+    echo "source '/usr/share/emsdk-${EMSDK}/emsdk_env.sh'" > /etc/profile.d/emsdk.sh
 
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 

From ba25a85ec49ea7a2f650bd9c715e6bef734d86f8 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 17:12:19 +0200
Subject: [PATCH 15/23] Fix dockerfile

---
 .ci/docker/conan-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index c484212dae0..2e01429bfab 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -177,7 +177,7 @@ RUN cd /tmp && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \
-    echo "source '/usr/share/emsdk-${EMSDK}/emsdk_env.sh'" > /etc/profile.d/emsdk.sh
+    echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
 
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 

From 9b632a0c3e0ad18bc00d672d5c7fe0f51ee82cf6 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Tue, 10 Jun 2025 18:08:41 +0200
Subject: [PATCH 16/23] Fix dockerfile

---
 .ci/docker/conan-tests | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index 2e01429bfab..ba360e9e79d 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -176,8 +176,10 @@ RUN cd /tmp && \
     cd /usr/share/emsdk-${EMSDK} && \
     ./emsdk update && \
     ./emsdk install latest && \
-    ./emsdk activate latest --permanent && \
-    echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
+    ./emsdk activate latest --permanent
+    # echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
+# Manually add the environment variables to the PATH
+ENV PATH "/usr/share/emsdk-$EMSDK:/usr/share/emsdk-$EMSDK/upstream/emscripten:/usr/share/emsdk-$EMSDK/node/22.16.0_64bit/bin:$PATH"
 
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 

From c6f28e69bd83e556460cf8995e435bd5121c36b7 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 11 Jun 2025 09:38:25 +0200
Subject: [PATCH 17/23] Add EM_CACHE in docker container

---
 .ci/docker/conan-tests | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index ba360e9e79d..a02ff21b892 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -178,8 +178,9 @@ RUN cd /tmp && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent
     # echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
-# Manually add the environment variables to the PATH
-ENV PATH "/usr/share/emsdk-$EMSDK:/usr/share/emsdk-$EMSDK/upstream/emscripten:/usr/share/emsdk-$EMSDK/node/22.16.0_64bit/bin:$PATH"
+# Manually add the emsdk binaries to the PATH and set emcc cache directory to a writable location
+ENV PATH="/usr/share/emsdk-$EMSDK:/usr/share/emsdk-$EMSDK/upstream/emscripten:/usr/share/emsdk-$EMSDK/node/22.16.0_64bit/bin:$PATH" \
+    EM_CACHE=$HOME/.emscripten_cache
 
 RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
 

From 1548eaeaeba0ddd3fbf96d30ffcc7e484cb58148 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 11 Jun 2025 14:18:43 +0200
Subject: [PATCH 18/23] Pre build emscripten binaries on image and remove
 windows specific tests

---
 .ci/docker/conan-tests                             |  4 +++-
 test/functional/toolchains/emscripten/test_emcc.py | 11 +++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index a02ff21b892..725fbf097e5 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -176,7 +176,9 @@ RUN cd /tmp && \
     cd /usr/share/emsdk-${EMSDK} && \
     ./emsdk update && \
     ./emsdk install latest && \
-    ./emsdk activate latest --permanent
+    ./emsdk activate latest --permanent && \
+    embuilder build MINIMAL && \
+    embuilder build MINIMAL --wasm64
     # echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
 # Manually add the emsdk binaries to the PATH and set emcc cache directory to a writable location
 ENV PATH="/usr/share/emsdk-$EMSDK:/usr/share/emsdk-$EMSDK/upstream/emscripten:/usr/share/emsdk-$EMSDK/node/22.16.0_64bit/bin:$PATH" \
diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index eed139ce15a..9e18957460d 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -91,8 +91,7 @@ def test_cmake_emscripten():
 
     client.run("build . -pr:h=wasm32")
     assert "em++   -stdlib=libc++ -O3 -DNDEBUG -std=c++17" in client.out
-    build_folder = "build/release-wasm" if platform.system() != "Windows" else "build"
-    assert os.path.exists(os.path.join(client.current_folder, build_folder, "hello.wasm"))
+    assert os.path.exists(os.path.join(client.current_folder, "build/release-wasm" , "hello.wasm"))
 
     # Run JavaScript generated code which uses .wasm file
     client.run_command("node ./build/release-wasm/hello")
@@ -100,9 +99,8 @@ def test_cmake_emscripten():
 
     client.run("build . -pr:h=asmjs")
     assert "WASM=0" in client.out
-    build_folder = "build/release-asm.js" if platform.system() != "Windows" else "build"
     # No wasm should be generated for asm.js architecture
-    assert not os.path.exists(os.path.join(client.current_folder, build_folder, "hello.wasm"))
+    assert not os.path.exists(os.path.join(client.current_folder, "build/release-asm.js" , "hello.wasm"))
     client.run_command("node ./build/release-asm.js/hello")
     assert "Hello World Release!" in client.out
 
@@ -121,7 +119,8 @@ def test_meson_emscripten():
     assert "C++ linker for the host machine: em++ ld.wasm" in client.out
     assert "Host machine cpu family: wasm64" in client.out
     assert os.path.exists(os.path.join(client.current_folder, "build", "hello.wasm"))
-    client.run_command("node ./build/hello")
+    # Add --experimental-wasm-memory64 flag as node version in CI is less than 24 (the one shipped with Emscripten 4.0.10)
+    client.run_command("node --experimental-wasm-memory64 ./build/hello")
     assert "Hello World Release!" in client.out
 
     rmtree(os.path.join(client.current_folder, "build"))
@@ -143,7 +142,7 @@ def test_meson_emscripten():
 def test_autotools_emscripten():
     client = TestClient(path_with_spaces=False)
     client.run("new autotools_exe -d name=hello -d version=0.1")
-    client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
+    client.save({"wasm32": wasm32_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
     client.run("build . -pr:h=wasm32")
     assert "em++  -stdlib=libc++  -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4GB -sINITIAL_MEMORY=64MB -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4GB -sINITIAL_MEMORY=64MB" in client.out
     assert "checking for wasm32-local-emscripten-ranlib... emranlib" in client.out

From 56771f4ef93fcfdf4a86bcb40e16af96466fa533 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 11 Jun 2025 16:32:31 +0200
Subject: [PATCH 19/23] Pre build emscripten binaries on image and remove
 windows specific tests

---
 .ci/docker/conan-tests | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index 725fbf097e5..71abebe0043 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -177,6 +177,7 @@ RUN cd /tmp && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \
+    source /usr/share/emsdk-${EMSDK}/emsdk_env.sh && \
     embuilder build MINIMAL && \
     embuilder build MINIMAL --wasm64
     # echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc

From 3239a8e52bc36103577e8f8b3d1ea373337aaab0 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 11 Jun 2025 16:49:06 +0200
Subject: [PATCH 20/23] Pre build emscripten binaries on image and remove
 windows specific tests

---
 .ci/docker/conan-tests | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/docker/conan-tests b/.ci/docker/conan-tests
index 71abebe0043..5f7ee6f2931 100644
--- a/.ci/docker/conan-tests
+++ b/.ci/docker/conan-tests
@@ -177,10 +177,10 @@ RUN cd /tmp && \
     ./emsdk update && \
     ./emsdk install latest && \
     ./emsdk activate latest --permanent && \
-    source /usr/share/emsdk-${EMSDK}/emsdk_env.sh && \
+    . /usr/share/emsdk-${EMSDK}/emsdk_env.sh && \
     embuilder build MINIMAL && \
     embuilder build MINIMAL --wasm64
-    # echo "EMSDK_QUIET=1 source /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
+    # echo "EMSDK_QUIET=1 . /usr/share/emsdk-${EMSDK}/emsdk_env.sh" >> /etc/bash.bashrc
 # Manually add the emsdk binaries to the PATH and set emcc cache directory to a writable location
 ENV PATH="/usr/share/emsdk-$EMSDK:/usr/share/emsdk-$EMSDK/upstream/emscripten:/usr/share/emsdk-$EMSDK/node/22.16.0_64bit/bin:$PATH" \
     EM_CACHE=$HOME/.emscripten_cache

From 0fb3e7c987b71a6ad339b5de7ca00c59b138c1e3 Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 11 Jun 2025 17:59:41 +0200
Subject: [PATCH 21/23] Only run node wasm64 on macos

---
 test/functional/toolchains/emscripten/test_emcc.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index 9e18957460d..9dbe94dd221 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -119,9 +119,10 @@ def test_meson_emscripten():
     assert "C++ linker for the host machine: em++ ld.wasm" in client.out
     assert "Host machine cpu family: wasm64" in client.out
     assert os.path.exists(os.path.join(client.current_folder, "build", "hello.wasm"))
-    # Add --experimental-wasm-memory64 flag as node version in CI is less than 24 (the one shipped with Emscripten 4.0.10)
-    client.run_command("node --experimental-wasm-memory64 ./build/hello")
-    assert "Hello World Release!" in client.out
+    # wasm64 only supported since node v23 so only run in MacOS where it is available
+    if platform.system() == "Darwin":
+        client.run_command("node ./build/hello")
+        assert "Hello World Release!" in client.out
 
     rmtree(os.path.join(client.current_folder, "build"))
     client.run("build . -pr:h=asmjs")

From 20a4fa4649fbb6867bb54597347f90c3fcc8002b Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Wed, 11 Jun 2025 18:19:56 +0200
Subject: [PATCH 22/23] Relax tests to be os agnostic

---
 test/functional/toolchains/emscripten/test_emcc.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index 9dbe94dd221..0ebeb8208b9 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -90,7 +90,7 @@ def test_cmake_emscripten():
     client.save({"wasm32": wasm32_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
 
     client.run("build . -pr:h=wasm32")
-    assert "em++   -stdlib=libc++ -O3 -DNDEBUG -std=c++17" in client.out
+    assert "Conan toolchain: Defining libcxx as C++ flags: -stdlib=libc++" in client.out
     assert os.path.exists(os.path.join(client.current_folder, "build/release-wasm" , "hello.wasm"))
 
     # Run JavaScript generated code which uses .wasm file
@@ -145,7 +145,6 @@ def test_autotools_emscripten():
     client.run("new autotools_exe -d name=hello -d version=0.1")
     client.save({"wasm32": wasm32_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
     client.run("build . -pr:h=wasm32")
-    assert "em++  -stdlib=libc++  -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4GB -sINITIAL_MEMORY=64MB -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4GB -sINITIAL_MEMORY=64MB" in client.out
     assert "checking for wasm32-local-emscripten-ranlib... emranlib" in client.out
     assert "checking for wasm32-local-emscripten-gcc... emcc" in client.out
     assert "checking for wasm32-local-emscripten-ar... emar" in client.out

From 43769af4477ce2b6e412272c441adfbc60c1c70a Mon Sep 17 00:00:00 2001
From: PerseoGI <perseog@jfrog.com>
Date: Thu, 12 Jun 2025 09:07:11 +0200
Subject: [PATCH 23/23] Removed unneded platform_tool_requires

---
 .../toolchains/emscripten/test_emcc.py         | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/test/functional/toolchains/emscripten/test_emcc.py b/test/functional/toolchains/emscripten/test_emcc.py
index 0ebeb8208b9..cce407c9d07 100644
--- a/test/functional/toolchains/emscripten/test_emcc.py
+++ b/test/functional/toolchains/emscripten/test_emcc.py
@@ -17,9 +17,6 @@
     compiler.version=4.0.10
     os=Emscripten
 
-    [platform_tool_requires]
-    emsdk/4.0.10
-
     [conf]
     tools.build:exelinkflags=['-sALLOW_MEMORY_GROWTH=1']
     tools.build:sharedlinkflags=['-sALLOW_MEMORY_GROWTH=1']
@@ -99,7 +96,7 @@ def test_cmake_emscripten():
 
     client.run("build . -pr:h=asmjs")
     assert "WASM=0" in client.out
-    # No wasm should be generated for asm.js architecture
+    # No wasm should have been generated for asm.js architecture
     assert not os.path.exists(os.path.join(client.current_folder, "build/release-asm.js" , "hello.wasm"))
     client.run_command("node ./build/release-asm.js/hello")
     assert "Hello World Release!" in client.out
@@ -159,17 +156,12 @@ def test_autotools_emscripten():
     rmtree(os.path.join(client.current_folder, "build-release"))
     client.run("build . -pr:h=asmjs")
     assert "WASM=0" in client.out
-    # No wasm should be generated for asm.js architecture
+    # No wasm should have been generated for asm.js architecture
     assert not os.path.exists(os.path.join(client.current_folder, "build-release", "hello.wasm"))
     client.run_command("node ./build-release/src/hello")
     assert "Hello World Release!" in client.out
 
 
-# TODO: need incubating bazel toolchain
-# def test_bazel_emscripten():
-#     client = TestClient(path_with_spaces=False)
-#     client.run("new bazel7_exe -d name=hello -d version=0.1")
-#     client.save({"wasm32": wasm32_profile, "wasm64": wasm_64_profile, "asmjs": asmjs_profile, "base_emscripten_profile": base_emscripten_profile,})
-#     client.run("build . -pr:h=wasm32")
-
-# TODO: give support to msbuild
+# TODO: test_bazel_emscripten(): need WIP new bazel toolchain
+# TODO: test_msbuild_emscripten(): give support to msbuild
+# TODO: test_premake_emscripten(): premake tests