StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix gcc libraries for host targets with platform libc++

Browse Source 
Targeting the platform-provided libc++ on the host requires passing
-nodefautlibs to gcc, and then re-adding all the default libs except
libc++.

Change-Id: I5a42375bcc819b07f6ee02e9d76e7f5088fa00e0
This commit is contained in:
Colin Cross
2015-04-27 11:13:34 -07:00
parent 9ffb4f5295
commit 712fc026df
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cc/cc.go
View File

@@ -743,6 +743,11 @@ func (c *CCLinked) stl(ctx common.AndroidBaseContext) string {
}
}
var (
hostDynamicGccLibs = []string{"-lgcc_s", "-lgcc", "-lc", "-lgcc_s", "-lgcc"}
hostStaticGccLibs = []string{"-Wl,--start-group", "-lgcc", "-lgcc_eh", "-lc", "-Wl,--end-group"}
)
func (c *CCLinked) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags {
stl := c.stl(ctx)
if ctx.Failed() {
@@ -756,7 +761,12 @@ func (c *CCLinked) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags
if ctx.Host() {
flags.CppFlags = append(flags.CppFlags, "-nostdinc++")
flags.LdFlags = append(flags.LdFlags, "-nodefaultlibs")
flags.LdFlags = append(flags.LdFlags, "-lc", "-lm", "-lpthread")
flags.LdFlags = append(flags.LdFlags, "-lm", "-lpthread")
if c.shared() {
flags.LdFlags = append(flags.LdFlags, hostDynamicGccLibs...)
} else {
flags.LdFlags = append(flags.LdFlags, hostStaticGccLibs...)
}
}
case "stlport", "stlport_static":
if ctx.Device() {
@@ -785,7 +795,11 @@ func (c *CCLinked) Flags(ctx common.AndroidModuleContext, flags CCFlags) CCFlags
if ctx.Host() {
flags.CppFlags = append(flags.CppFlags, "-nostdinc++")
flags.LdFlags = append(flags.LdFlags, "-nodefaultlibs")
flags.LdFlags = append(flags.LdFlags, "-lc", "-lm")
if c.shared() {
flags.LdFlags = append(flags.LdFlags, hostDynamicGccLibs...)
} else {
flags.LdFlags = append(flags.LdFlags, hostStaticGccLibs...)
}
}
default:
panic(fmt.Errorf("Unknown stl in CCLinked.Flags: %q", stl))