Auto merge of #81732 - m-ou-se:inherit-overflow-checks, r=Mark-Simulacrum

[rust.git] / x.py

diff --git a/x.py b/x.py
index d281a6abc93e37ef7321bf83110ec54846e3df5a..4f64ea9fae8b8391bd8dd330bb3a74bc0a9d628c 100755 (executable)
--- a/x.py
+++ b/x.py
@@ -1,22 +1,27 @@
 #!/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 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
 
-import sys
+# This file is only a "symlink" to bootstrap.py, all logic should go there.
+
 import os
-dir = os.path.dirname(__file__)
-sys.path.append(os.path.abspath(os.path.join(dir, "src", "bootstrap")))
+import sys
 
-import bootstrap
+# 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"))
 
-try:
-    bootstrap.main()
-except KeyboardInterrupt:
-    sys.exit()
+import bootstrap
+bootstrap.main()