about summary refs log tree commit diff
path: root/src/bootstrap/mk
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-11 12:33:12 +0000
committerbors <bors@rust-lang.org>2016-12-11 12:33:12 +0000
commitfd5dc057936f5d84ccd8c1d5965f60e669b589d8 (patch)
tree600a4d2f6d58f1b123148dfd0676c937197c223e /src/bootstrap/mk
parente0158e02f97957c3d8cbd9c52da5aadaf898d447 (diff)
parent25adc4e82ee405127beff6e200499122ed2099dc (diff)
downloadrust-fd5dc057936f5d84ccd8c1d5965f60e669b589d8.tar.gz
rust-fd5dc057936f5d84ccd8c1d5965f60e669b589d8.zip
Auto merge of #38252 - pnkfelix:mildly-robustify-configure-msg, r=alexcrichton
Make configure message re x.py not assume build dir == src dir

Fix #38251 but perhaps not BEST fix for it.

As driveby, fix copyright year in `Makefile.in`
Diffstat (limited to 'src/bootstrap/mk')
-rw-r--r--src/bootstrap/mk/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index ef02f21a34b..1fa70081938 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.
 #