Auto merge of #1405 - alexcrichton:issue-1401, r=alexcrichton

This should inadvertently fix #1401

Author: bors

configure

@@ -374,12 +374,12 @@ if [ ! -z "$CFG_ENABLE_NIGHTLY" ]; then
         mkdir -p .cargo
         cat > .cargo/config <<-EOF
 [target.x86_64-unknown-linux-gnu.openssl]
-rustc-flags = "-l ssl:static -l crypto:static -l dl -L /home/rustbuild/root64/lib"
+rustc-flags = "-l static=ssl -l static=crypto -l dl -L /home/rustbuild/root64/lib"
 root = "/home/rustbuild/root64"
 include = "/home/rustbuild/root64/include"
 
 [target.i686-unknown-linux-gnu.openssl]
-rustc-flags = "-l ssl:static -l crypto:static -l dl -L /home/rustbuild/root32/lib"
+rustc-flags = "-l static=ssl -l static=crypto -l dl -L /home/rustbuild/root32/lib"
 root = "/home/rustbuild/root32"
 include = "/home/rustbuild/root32/include"
 EOF

tests/test_cargo_compile_custom_build.rs

@@ -835,7 +835,7 @@ test!(output_separate_lines {
         .file("build.rs", r#"
             fn main() {
                 println!("cargo:rustc-flags=-L foo");
-                println!("cargo:rustc-flags=-l foo:static");
+                println!("cargo:rustc-flags=-l static=foo");
             }
         "#);
     assert_that(p.cargo_process("build").arg("-v"),
@@ -844,7 +844,7 @@ test!(output_separate_lines {
 {compiling} foo v0.5.0 (file://[..])
 {running} `rustc build.rs [..]`
 {running} `[..]foo-[..]build-script-build[..]`
-{running} `rustc [..] --crate-name foo [..] -L foo -l foo:static`
+{running} `rustc [..] --crate-name foo [..] -L foo -l static=foo`
 ", compiling = COMPILING, running = RUNNING)));
 });