tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix libgcc/libatomic link order

Browse source 
This is the equivalent commit to https://android-review.googlesource.com/144749

Change-Id: I79374f33766fa307fd031ffd0cbd9e9d37848324
This commit is contained in:
Dan Willemsen 2015-07-08 13:02:23 -07:00
parent ffce3fcf33
commit edc385f5eb
1 changed files with 8 additions and 8 deletions
Show stats 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...)