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

Merge "Fix libgcc/libatomic link order" into master-soong

Browse Source
This commit is contained in:
Dan Willemsen
2015-07-09 02:04:16 +00:00
committed by Gerrit Code Review
parent eba363ed67 edc385f5eb
commit 3fde0c220a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cc/builder.go
View File

@@ -302,6 +302,14 @@ func TransformObjToDynamicBinary(ctx common.AndroidModuleContext,
libFlagsList = append(libFlagsList, staticLibs...) libFlagsList = append(libFlagsList, staticLibs...)
if groupLate && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group")
}
libFlagsList = append(libFlagsList, lateStaticLibs...)
if groupLate && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--end-group")
}
for _, lib := range sharedLibs { for _, lib := range sharedLibs {
dir, file := filepath.Split(lib) dir, file := filepath.Split(lib)
if !strings.HasPrefix(file, "lib") { if !strings.HasPrefix(file, "lib") {
@@ -315,14 +323,6 @@ func TransformObjToDynamicBinary(ctx common.AndroidModuleContext,
ldDirs = append(ldDirs, dir) ldDirs = append(ldDirs, dir)
} }
if groupLate && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group")
}
libFlagsList = append(libFlagsList, lateStaticLibs...)
if groupLate && len(lateStaticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--end-group")
}
deps = append(deps, ldCmd) deps = append(deps, ldCmd)
deps = append(deps, sharedLibs...) deps = append(deps, sharedLibs...)
deps = append(deps, staticLibs...) deps = append(deps, staticLibs...)