Skip to content

Commit fd5dc05

Browse files
committed
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`
2 parents e0158e0 + 25adc4e commit fd5dc05

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

configure

+7-1
Original file line numberDiff line numberDiff line change
@@ -1890,14 +1890,20 @@ else
18901890
step_msg "complete"
18911891
fi
18921892

1893+
if [ "$CFG_SRC_DIR" = `pwd` ]; then
1894+
X_PY=x.py
1895+
else
1896+
X_PY=${CFG_SRC_DIR_RELATIVE}x.py
1897+
fi
1898+
18931899
if [ -z "$CFG_DISABLE_RUSTBUILD" ]; then
18941900
msg "NOTE you have now configured rust to use a rewritten build system"
18951901
msg " called rustbuild, and as a result this may have bugs that "
18961902
msg " you did not see before. If you experience any issues you can"
18971903
msg " go back to the old build system with --disable-rustbuild and"
18981904
msg " please feel free to report any bugs!"
18991905
msg ""
1900-
msg "run \`python x.py --help\`"
1906+
msg "run \`python ${X_PY} --help\`"
19011907
else
19021908
warn "the makefile-based build system is deprecated in favor of rustbuild"
19031909
msg ""

src/bootstrap/mk/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 20126 The Rust Project Developers. See the COPYRIGHT
1+
# Copyright 2016 The Rust Project Developers. See the COPYRIGHT
22
# file at the top-level directory of this distribution and at
33
# http://rust-lang.org/COPYRIGHT.
44
#

0 commit comments

Comments
 (0)