From 25adc4e82ee405127beff6e200499122ed2099dc Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Thu, 8 Dec 2016 13:09:20 -1000
Subject: [PATCH] Fix #38251 but perhaps not BEST fix for it.

---
 configure                    | 8 +++++++-
 src/bootstrap/mk/Makefile.in | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index a287291c280..0a07e41fb97 100755
--- a/configure
+++ b/configure
@@ -1890,6 +1890,12 @@ else
     step_msg "complete"
 fi
 
+if [ "$CFG_SRC_DIR" = `pwd` ]; then
+    X_PY=x.py
+else
+    X_PY=${CFG_SRC_DIR_RELATIVE}x.py
+fi
+
 if [ -z "$CFG_DISABLE_RUSTBUILD" ]; then
     msg "NOTE you have now configured rust to use a rewritten build system"
     msg "     called rustbuild, and as a result this may have bugs that "
@@ -1897,7 +1903,7 @@ if [ -z "$CFG_DISABLE_RUSTBUILD" ]; then
     msg "     go back to the old build system with --disable-rustbuild and"
     msg "     please feel free to report any bugs!"
     msg ""
-    msg "run \`python x.py --help\`"
+    msg "run \`python ${X_PY} --help\`"
 else
     warn "the makefile-based build system is deprecated in favor of rustbuild"
     msg ""
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index b165048b7b6..a06e2f3fb54 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright 20126 The Rust Project Developers. See the COPYRIGHT
+# 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.
 #