Skip to content

Commit

Permalink
Merge pull request #90939 from AThousandShips/web_ver_fix
Browse files Browse the repository at this point in the history
[Web] Fix building for web on Windows
  • Loading branch information
akien-mga committed Apr 22, 2024
2 parents bfca90a + 173692d commit 69811b9
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,11 @@ def get_compiler_version(env):
# Not using -dumpversion as some GCC distros only return major, and
# Clang used to return hardcoded 4.2.1: # https://reviews.llvm.org/D56803
try:
version = subprocess.check_output([env.subst(env["CXX"]), "--version"]).strip().decode("utf-8")
version = (
subprocess.check_output([env.subst(env["CXX"]), "--version"], shell=(os.name == "nt"))
.strip()
.decode("utf-8")
)
except (subprocess.CalledProcessError, OSError):
print("Couldn't parse CXX environment variable to infer compiler version.")
return ret
Expand Down

0 comments on commit 69811b9

Please sign in to comment.