commit 72bd7dba4a9edf9a59b2fae92c331da4d83aff6e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 21 19:27:39 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 21 19:27:40 2016 +0000
tree faa71d626814422ce435ac411c58d400ae21b287
parent c2062f9c440963936944e9cb8a89a01968fc7bdf
parent f59b69ccaa76933298e608c377b82d38f363efbb

Merge "Refactor bionic includes into a single place"

cc/builder.go

diff --git a/cc/builder.go b/cc/builder.go
index 49f8871..0787847 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -385,8 +385,7 @@
 		if !strings.HasSuffix(file, flags.toolchain.ShlibSuffix()) {
 			panic("shared library " + lib.String() + " does not end with " + flags.toolchain.ShlibSuffix())
 		}
-		libFlagsList = append(libFlagsList,
-			"-l"+strings.TrimSuffix(strings.TrimPrefix(file, "lib"), flags.toolchain.ShlibSuffix()))
+		libFlagsList = append(libFlagsList, lib.String())
 		ldDirs = append(ldDirs, dir)
 	}