Skip to content

Commit

Permalink
update tools.build:compiler_executables instead of define
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceIm committed Dec 2, 2022
1 parent 8962164 commit 3701d05
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions recipes/emsdk/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ def package_info(self):
"c": self._define_tool_var("emcc"),
"cpp": self._define_tool_var("em++"),
}
self.conf_info.define("tools.build:compiler_executables", compiler_executables)
self.buildenv_info.define_path("CC", compiler_executables.get("c"))
self.buildenv_info.define_path("CXX", compiler_executables.get("cpp"))
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"))
Expand All @@ -188,8 +188,8 @@ def package_info(self):
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 = compiler_executables.get("c")
self.env_info.CXX = compiler_executables.get("cpp")
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")
Expand Down

0 comments on commit 3701d05

Please sign in to comment.