From 3701d055269476f6d5249741048ee9a07363e50d Mon Sep 17 00:00:00 2001 From: SpaceIm <30052553+SpaceIm@users.noreply.github.com> Date: Fri, 2 Dec 2022 10:51:31 +0100 Subject: [PATCH] update `tools.build:compiler_executables` instead of define --- recipes/emsdk/all/conanfile.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipes/emsdk/all/conanfile.py b/recipes/emsdk/all/conanfile.py index b38a8bcf7323c..64d00c5064905 100644 --- a/recipes/emsdk/all/conanfile.py +++ b/recipes/emsdk/all/conanfile.py @@ -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")) @@ -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")