ericLemanissier/conan-center-index
1
0
Fork 1
mirror of https://github.com/conan-io/conan-center-index.git synced 2025-08-14 18:51:15 +00:00
Code Issues 6 Packages Projects Releases Wiki Activity

(#14505) emsdk: define tools.build:compiler_executables config

Browse Source 
* define `tools.build:compiler_executables` config

* fix keys of compiler_executables

* update `tools.build:compiler_executables` instead of define
This commit is contained in:
SpaceIm
2022-12-12 13:26:48 +01:00
committed by GitHub
parent 4fd8295a95
commit ab04736753
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
recipes/emsdk/all/conanfile.py
View File

@@ -159,8 +159,13 @@ class EmSDKConan(ConanFile):
self.buildenv_info.define_path("EM_CONFIG", self._em_config)
self.buildenv_info.define_path("EM_CACHE", self._em_cache)
self.buildenv_info.define_path("CC", self._define_tool_var("emcc"))
self.buildenv_info.define_path("CXX", self._define_tool_var("em++"))
compiler_executables = {
"c": self._define_tool_var("emcc"),
"cpp": self._define_tool_var("em++"),
}
self.conf_info.update("tools.build:compiler_executables", compiler_executables)
self.buildenv_info.define_path("CC", compiler_executables["c"])
self.buildenv_info.define_path("CXX", compiler_executables["cpp"])
self.buildenv_info.define_path("AR", self._define_tool_var("emar"))
self.buildenv_info.define_path("NM", self._define_tool_var("emnm"))
self.buildenv_info.define_path("RANLIB", self._define_tool_var("emranlib"))
@@ -183,8 +188,8 @@ class EmSDKConan(ConanFile):
self.env_info.EMSCRIPTEN = self._emscripten
self.env_info.EM_CONFIG = self._em_config
self.env_info.EM_CACHE = self._em_cache
self.env_info.CC = self._define_tool_var("emcc")
self.env_info.CXX = self._define_tool_var("em++")
self.env_info.CC = compiler_executables["c"]
self.env_info.CXX = compiler_executables["cpp"]
self.env_info.AR = self._define_tool_var("emar")
self.env_info.NM = self._define_tool_var("emnm")
self.env_info.RANLIB = self._define_tool_var("emranlib")