bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Skip rustc version detection on macOS

Browse source
This commit is contained in:
John Kelly 2023-04-27 17:39:58 +01:00
parent 6ce22733b9
commit 1b390f44cf
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/bootstrap.py
View file

@ -209,6 +209,11 @@ def default_build_triple(verbose):
# install, use their preference. This fixes most issues with Windows builds # install, use their preference. This fixes most issues with Windows builds
# being detected as GNU instead of MSVC. # being detected as GNU instead of MSVC.
default_encoding = sys.getdefaultencoding() default_encoding = sys.getdefaultencoding()
if sys.platform == 'darwin':
print("not using rustc detection as it is unreliable on macOS")
print("falling back to auto-detect")
else:
try: try:
version = subprocess.check_output(["rustc", "--version", "--verbose"], version = subprocess.check_output(["rustc", "--version", "--verbose"],
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)