Make name replacement pattern match (new?) stage2 libraries

[caldwell]

I tried to install the 2015-09-15 nightly last night and ran into some issues with the library names:

$ otool -L /usr/local/lib/rustlib/x86_64-apple-darwin/lib/libsyntax-35017696.dylib
/usr/local/lib/rustlib/x86_64-apple-darwin/lib/libsyntax-35017696.dylib:
        /usr/local/lib/rustlib/x86_64-apple-darwin/lib/libsyntax-35017696.dylib (compatibility version 0.0.0, current version 0.0.0)
        /usr/local/Cellar/rust-nightly/1.0-2015-09-15/lib/libfmt_macros-35017696.dylib (compatibility version 0.0.0, current version 0.0.0)
        /usr/local/Cellar/rust-nightly/1.0-2015-09-15/lib/libterm-35017696.dylib (compatibility version 0.0.0, current version 0.0.0)
        /usr/local/Cellar/rust-nightly/1.0-2015-09-15/lib/libserialize-35017696.dylib (compatibility version 0.0.0, current version 0.0.0)
        x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib/liblog-35017696.dylib (compatibility version 0.0.0, current version 0.0.0)
        x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib/libstd-35017696.dylib (compatibility version 0.0.0, current version 0.0.0)
        /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 159.1.0)

This patch fixes the 2 stage2 libraries that didn't get renamed.

[pointlessone]

This seem to be intermittent.

/usr/local/homebrew/Cellar/rust-nightly/1.0-2015-09-16/lib/rustlib/x86_64-apple-darwin/lib/libsyntax-10cbabc2.dylib:
    /usr/local/lib/rustlib/x86_64-apple-darwin/lib/libsyntax-10cbabc2.dylib (compatibility version 0.0.0, current version 0.0.0)
    /usr/local/homebrew/Cellar/rust-nightly/1.0-2015-09-16/lib/libfmt_macros-10cbabc2.dylib (compatibility version 0.0.0, current version 0.0.0)
    /usr/local/homebrew/Cellar/rust-nightly/1.0-2015-09-16/lib/libterm-10cbabc2.dylib (compatibility version 0.0.0, current version 0.0.0)
    /usr/local/homebrew/Cellar/rust-nightly/1.0-2015-09-16/lib/libserialize-10cbabc2.dylib (compatibility version 0.0.0, current version 0.0.0)
    /usr/local/homebrew/Cellar/rust-nightly/1.0-2015-09-16/lib/liblog-10cbabc2.dylib (compatibility version 0.0.0, current version 0.0.0)
    /usr/local/homebrew/Cellar/rust-nightly/1.0-2015-09-16/lib/libstd-10cbabc2.dylib (compatibility version 0.0.0, current version 0.0.0)
    /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 159.1.0)

Also note that lib path correction only happens only on two binaries: rustc and rustdoc.

No other file is changed during the installation.

Did this patch fix your problem?

[caldwell]

Hmm. I rolled back my changes and verified your results with rustc 1.5.0-nightly (47d125d0f 2015-09-16). The rust that was giving me trouble was rustc 1.4.0-nightly (e629dba0e 2015-09-14). It's hard to go back back and test with that one. I swear the problem existed though, I debugged for an hour! :-)

It does seem transient though, so if you want to hold off on the patch that's cool. Things seem to move fast in rust-land.