openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Include objs from whole static libs before local objs 

This matches the make behavior.

Change-Id: I8265fb481424734062b0fca944cdbbe283b7236d
This commit is contained in:
Dan Willemsen 2016-05-11 17:25:48 -07:00
parent ac6697420a
commit 025b4807cb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cc/cc.go
View File

@ -1540,16 +1540,16 @@ func (library *libraryLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
func (library *libraryLinker) linkStatic(ctx ModuleContext, func (library *libraryLinker) linkStatic(ctx ModuleContext,
flags Flags, deps PathDeps, objFiles common.Paths) common.Path { flags Flags, deps PathDeps, objFiles common.Paths) common.Path {
objFiles = append(objFiles, deps.WholeStaticLibObjFiles...) library.objFiles = append(common.Paths{}, deps.WholeStaticLibObjFiles...)
library.objFiles = objFiles library.objFiles = append(library.objFiles, objFiles...)
outputFile := common.PathForModuleOut(ctx, outputFile := common.PathForModuleOut(ctx,
ctx.ModuleName()+library.Properties.VariantName+staticLibraryExtension) ctx.ModuleName()+library.Properties.VariantName+staticLibraryExtension)
if ctx.Darwin() { if ctx.Darwin() {
TransformDarwinObjToStaticLib(ctx, objFiles, flagsToBuilderFlags(flags), outputFile) TransformDarwinObjToStaticLib(ctx, library.objFiles, flagsToBuilderFlags(flags), outputFile)
} else { } else {
TransformObjToStaticLib(ctx, objFiles, flagsToBuilderFlags(flags), outputFile) TransformObjToStaticLib(ctx, library.objFiles, flagsToBuilderFlags(flags), outputFile)
} }
library.wholeStaticMissingDeps = ctx.GetMissingDependencies() library.wholeStaticMissingDeps = ctx.GetMissingDependencies()