install script doesn't recognize --docdir option

[kamathba]

ran ./configure && make && sudo make install

...
gen-install-script: CFG_LEGACY_MANIFEST_DIRS := rustlib,cargo
gen-install-script:
gen-install-script: validating arguments
gen-install-script:
install: error: Option '--docdir=/usr/local/share/doc/rust' is not recognized
/home/banjo/Work/dev/rust/mk/install.mk:21: recipe for target 'install' failed
make: *** [install] Error 1

Seems to be introduced by this commit, which was merged yesterday.

commit 5e9149d
Author: orbea ovariegata@yahoo.com
Date: Thu Sep 8 23:18:20 2016 -0700

Allow setting --docdir

[nodakai]

Had we tested make install on buildbot... #19698

[m10e]

This is preventing installs for me too. Not sure if it matters, but I got it building a cross compiler from master branch with custom install dir (configure --prefix).

[andoriyu]

@m10e you can always apply patch to rust-installer before it's merged upstream.

[m10e]

@andoriyu Sure, so it's definitely not urgent. I was just weighing in with a +1. Thanks for the tip though!

[orbea]

Ideally the merged pull request should of only been merged when both when both pull requests were ready to be merged followed by updating the submodule. Unfortunately it did not work out that way, sorry for any issues I have caused...

[cesarb]

I believe this should be tagged with the label regression-from-stable-to-nightly. @alexcrichton ?

[alexcrichton]

Ah, didn't realize it was a regression, but in that case indeed!

[cesarb]

@alexcrichton Yes, make install on nightly is completely broken. If like me you follow Rust's master by doing ./configure --prefix=... && make && make install, you have to revert commit 5e9149d, otherwise the make install step will fail.

The issue is that, since that commit, install.sh is called by make install with the nonexistent option --docdir, and Rust's install.sh doesn't ignore unknown options.

[cesarb]

Related: #29632

[alexcrichton]

cc @orbea this may be caused by #36360, mind helping to investigate?

[tikue]

Is there a workaround for this currently? The latest nightly ICEs on code that previously compiled (I think due to #36816) so I wanted to compile from source with the merged fix, but now I'm hitting this.

[cesarb]

@tikue Yes, the workaround is to revert commit 5e9149d. There will be a conflict when reverting, but it's easy to resolve. Nothing depends on that commit (and in fact it's broken), so reverting it causes no problems.

[brson]

#36971