commit 1034786c379dcdc930c641ccbe8bd04936cce1f1
author Stephen Hines <srhines@google.com> Mon Jul 18 15:54:54 2016 -0700
committer Stephen Hines <srhines@google.com> Mon Jul 18 16:06:05 2016 -0700
tree 7cb13be2ac0e3c17dd6b7709e45efca0d9d07f98
parent 15e4554049181d0dee583f3659dc6fd263c21435

Revert "Revert "Switch libcompiler_rt-extras to LateStaticLibs.""

This reverts commit 15e4554049181d0dee583f3659dc6fd263c21435.

Change-Id: Iff62dd9fd45746847440f50240c25d32747367df

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index f8723bb..89f40b3 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1337,7 +1337,7 @@
 	deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...)
 
 	if !ctx.sdk() && ctx.ModuleName() != "libcompiler_rt-extras" {
-		deps.StaticLibs = append(deps.StaticLibs, "libcompiler_rt-extras")
+		deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras")
 	}
 
 	if ctx.Device() {