Skip to content

Commit

Permalink
Fix #38251 but perhaps not BEST fix for it.
Browse files Browse the repository at this point in the history
  • Loading branch information
pnkfelix committed Dec 8, 2016
1 parent 7537f95 commit 25adc4e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion configure
Expand Up @@ -1890,14 +1890,20 @@ 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 "
msg " you did not see before. If you experience any issues you can"
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 ""
Expand Down
2 changes: 1 addition & 1 deletion 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.
#
Expand Down

0 comments on commit 25adc4e

Please sign in to comment.