Remove trailing newline from llvm-config output

nikic · nikic · commit fe83c6cd5922 · 2020-03-02T21:51:08.000+01:00
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
@@ -1142,6 +1142,8 @@ impl Step for Compiletest {
             let llvm_config = builder.ensure(native::Llvm { target: builder.config.build });
             if !builder.config.dry_run {
                 let llvm_version = output(Command::new(&llvm_config).arg("--version"));
+                // Remove trailing newline from llvm-config output.
+                let llvm_version = llvm_version.trim_end();
                 cmd.arg("--llvm-version").arg(llvm_version);
             }
             if !builder.is_rust_llvm(target) {

Original file line number	Diff line number	Diff line change
`@@ -1142,6 +1142,8 @@ impl Step for Compiletest {`
`1142`	`1142`	`let llvm_config = builder.ensure(native::Llvm { target: builder.config.build });`
`1143`	`1143`	`if !builder.config.dry_run {`
`1144`	`1144`	`let llvm_version = output(Command::new(&llvm_config).arg("--version"));`
	`1145`	`+ // Remove trailing newline from llvm-config output.`
	`1146`	`+ let llvm_version = llvm_version.trim_end();`
`1145`	`1147`	`cmd.arg("--llvm-version").arg(llvm_version);`
`1146`	`1148`	`}`
`1147`	`1149`	`if !builder.is_rust_llvm(target) {`