OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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`
This commit is contained in:
bors 2016-12-11 12:33:12 +00:00
parent e0158e02f9 25adc4e82e
commit fd5dc05793
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -1890,6 +1890,12 @@ else
step_msg "complete" step_msg "complete"
fi 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 if [ -z "$CFG_DISABLE_RUSTBUILD" ]; then
msg "NOTE you have now configured rust to use a rewritten build system" 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 " 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 " go back to the old build system with --disable-rustbuild and"
msg " please feel free to report any bugs!" msg " please feel free to report any bugs!"
msg "" msg ""
msg "run \`python x.py --help\`" msg "run \`python ${X_PY} --help\`"
else else
warn "the makefile-based build system is deprecated in favor of rustbuild" warn "the makefile-based build system is deprecated in favor of rustbuild"
msg "" msg ""

2
src/bootstrap/mk/Makefile.in
View File

@ -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 # file at the top-level directory of this distribution and at
# http://rust-lang.org/COPYRIGHT. # http://rust-lang.org/COPYRIGHT.
# #