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

Merge "Fix mac build"

Browse Source
This commit is contained in:
Treehugger Robot
2016-12-06 04:39:00 +00:00
committed by Gerrit Code Review
parent 503f8b0262 7a7cf97597
commit b278a58325
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/builder.go
View File

@@ -466,11 +466,11 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
} }
} }
if flags.groupStaticLibs && len(staticLibs) > 0 { if flags.groupStaticLibs && !ctx.Darwin() && len(staticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--start-group") libFlagsList = append(libFlagsList, "-Wl,--start-group")
} }
libFlagsList = append(libFlagsList, staticLibs.Strings()...) libFlagsList = append(libFlagsList, staticLibs.Strings()...)
if flags.groupStaticLibs && len(staticLibs) > 0 { if flags.groupStaticLibs && !ctx.Darwin() && len(staticLibs) > 0 {
libFlagsList = append(libFlagsList, "-Wl,--end-group") libFlagsList = append(libFlagsList, "-Wl,--end-group")
} }