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

am 0eeea1e6: Merge "Port LOCAL_NO_LIBGCC from make"

Browse Source 
* commit '0eeea1e6f2a3f3f9d6d4208f756415e433878266':
  Port LOCAL_NO_LIBGCC from make
This commit is contained in:
Dan Willemsen
2015-09-16 23:08:30 +00:00
committed by Android Git Automerger
parent e2946615e7 0eeea1e6f2
commit a939dfcd2b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/cc.go
View File

@@ -274,6 +274,9 @@ type CCBaseProperties struct {
// compiling crt or libc. // compiling crt or libc.
Nocrt bool `android:"arch_variant"` Nocrt bool `android:"arch_variant"`
// don't link in libgcc.a
No_libgcc bool
// don't insert default compiler flags into asflags, cflags, // don't insert default compiler flags into asflags, cflags,
// cppflags, conlyflags, ldflags, or include_dirs // cppflags, conlyflags, ldflags, or include_dirs
No_default_compiler_flags bool No_default_compiler_flags bool
@@ -927,7 +930,10 @@ func (c *CCLinked) depNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDe
if ctx.Device() { if ctx.Device() {
// libgcc and libatomic have to be last on the command line // libgcc and libatomic have to be last on the command line
depNames.LateStaticLibs = append(depNames.LateStaticLibs, "libgcov", "libatomic", "libgcc") depNames.LateStaticLibs = append(depNames.LateStaticLibs, "libgcov", "libatomic")
if !c.Properties.No_libgcc {
depNames.LateStaticLibs = append(depNames.LateStaticLibs, "libgcc")
}
if !c.static() { if !c.static() {
depNames.SharedLibs = append(depNames.SharedLibs, c.systemSharedLibs(ctx)...) depNames.SharedLibs = append(depNames.SharedLibs, c.systemSharedLibs(ctx)...)