diff options
| -rw-r--r-- | xmake/modules/package/manager/conan/v2/install_package.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xmake/modules/package/manager/conan/v2/install_package.lua b/xmake/modules/package/manager/conan/v2/install_package.lua index f98c77c51..028c38cdf 100644 --- a/xmake/modules/package/manager/conan/v2/install_package.lua +++ b/xmake/modules/package/manager/conan/v2/install_package.lua @@ -199,11 +199,10 @@ function _conan_generate_compiler_profile(profile, configs, opt) local emscripten_cmakefile = find_file("Emscripten.cmake", path.join(emsdk.emscripten, "cmake/Modules/Platform")) assert(emscripten_cmakefile, "Emscripten.cmake not found!") - profile:print("compiler=clang") - local version = _conan_get_compiler_version("clang") - if version then - profile:print("compiler.version=" .. version) - end + profile:print("compiler=gcc") + profile:print("compiler.cppstd=gnu17") + profile:print("compiler.libcxx=libstdc++11") + profile:print("compiler.version=12") conf = {} conf["tools.build:compiler_executables"] = "{'c':'emcc', 'cpp':'em++', 'ar':'emar', 'ranlib':'emranlib'}" |