Skip to content

Commit 1f5ee97

Browse files
committed
auto merge of #17192 : skade/rust/fix-osx-linking, r=alexcrichton
Don't pass -fno-use-linker-plugin on OS X as clang does not accept it. clang fails linking with: ``` error: linking with `cc` failed: exit code: 1 ... arg list omitted... note: clang: error: unknown argument: '-fno-use-linker-plugin' [-Wunused-command-line-argument-hard-error-in-future] clang: note: this will be a hard error (cannot be downgraded to a warning) in the future ``` clang version: ``` $ clang -v Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn) Target: x86_64-apple-darwin13.2.0 Thread model: posix ```
2 parents 3e7e2af + e9c4efb commit 1f5ee97

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/librustc/back/link.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,12 @@ fn link_args(cmd: &mut Command,
931931
}
932932

933933
// Rust does its' own LTO
934-
cmd.arg("-fno-lto").arg("-fno-use-linker-plugin");
934+
cmd.arg("-fno-lto");
935+
936+
// clang fails hard if -fno-use-linker-plugin is passed
937+
if sess.targ_cfg.os == abi::OsWindows {
938+
cmd.arg("-fno-use-linker-plugin");
939+
}
935940

936941
// If we're building a dylib, we don't use --gc-sections because LLVM has
937942
// already done the best it can do, and we also don't want to eliminate the

0 commit comments

Comments
 (0)