X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=x.py;h=4f64ea9fae8b8391bd8dd330bb3a74bc0a9d628c;hb=b7654a3258b73002d99c5139a5b40c49245e9695;hp=e277ab98be10f30f945dad3570daeadf8e9c62d5;hpb=222971f7d2a098b4b8b57520452ab475bc5ea45f;p=rust.git diff --git a/x.py b/x.py index e277ab98be1..4f64ea9fae8 100755 --- a/x.py +++ b/x.py @@ -1,18 +1,25 @@ #!/usr/bin/env python -# Copyright 2016 The Rust Project Developers. See the COPYRIGHT -# file at the top-level directory of this distribution and at -# http://rust-lang.org/COPYRIGHT. -# -# Licensed under the Apache License, Version 2.0 or the MIT license -# , at your -# option. This file may not be copied, modified, or distributed -# except according to those terms. # This file is only a "symlink" to bootstrap.py, all logic should go there. import os import sys + +# If this is python2, check if python3 is available and re-execute with that +# interpreter. +if sys.version_info.major < 3: + try: + # On Windows, `py -3` sometimes works. + # Try this first, because 'python3' sometimes tries to launch the app + # store on Windows + os.execvp("py", ["py", "-3"] + sys.argv) + except OSError: + try: + os.execvp("python3", ["python3"] + sys.argv) + except OSError: + # Python 3 isn't available, fall back to python 2 + pass + rust_dir = os.path.dirname(os.path.abspath(__file__)) sys.path.append(os.path.join(rust_dir, "src", "bootstrap"))