From e9c4efb1bf00594c06bf694efe2f68c9633ed18b Mon Sep 17 00:00:00 2001 From: Florian Gilcher Date: Fri, 12 Sep 2014 13:26:21 +0200 Subject: [PATCH] Only pass -fno-use-linker-plugin on Windows Only pass -fno-use-linker-plugin on Windows where it avoids pulling in dependencies. Passing it to clang on OS X and Linux would make it fail though. --- src/librustc/back/link.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs index 77a837bfbb168..cc4e47de007d5 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs @@ -931,7 +931,12 @@ fn link_args(cmd: &mut Command, } // Rust does its' own LTO - cmd.arg("-fno-lto").arg("-fno-use-linker-plugin"); + cmd.arg("-fno-lto"); + + // clang fails hard if -fno-use-linker-plugin is passed + if sess.targ_cfg.os == abi::OsWindows { + cmd.arg("-fno-use-linker-plugin"); + } // If we're building a dylib, we don't use --gc-sections because LLVM has // already done the best it can do, and we also don't want to eliminate the