Don't force libraries upon static executables. am: dc2597d25a

am: 48e5befbdc Change-Id: I2c4c7644ea43b06753f9c62e741e2c88dea07df2
2017-01-27 23:05:14 +00:00 · 2017-01-27 23:05:14 +00:00 · 50cc75da63
parent 8215a5673c 48e5befbdc
commit 50cc75da63
1 changed files with 1 additions and 1 deletions
--- a/cc/binary.go
+++ b/cc/binary.go
@ -131,7 +131,7 @@ func (binary *binaryDecorator) linkerDeps(ctx DepsContext, deps Deps) Deps {
 		}

 		if binary.static() {
-			if inList("libc++_static", deps.StaticLibs) {
+			if ctx.selectedStl() == "libc++_static" {
 				deps.StaticLibs = append(deps.StaticLibs, "libm", "libc", "libdl")
 			}
 			// static libraries libcompiler_rt, libc and libc_nomalloc need to be linked with