Revert some changes from #51917 to fix custom libdir#52439

Merged

bors merged 1 commit intorust-lang:masterfrom

o01eg:fix-52317

Jul 19, 2018

Commits on Jul 16, 2018

Revert some changes from #51917 to fix #52317.
o01eg
committed