diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-11 17:25:48 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-12 13:20:52 -0700 |
| commit | 025b4807cb4c67193a3004a374ecadb504111d11 (patch) | |
| tree | e71152452d61e05c8f9c8a8ac2a1197379befe93 | |
| parent | ac6697420aebc6e7f98d5a73c8d4c525bf8de419 (diff) | |
| download | build_soong-025b4807cb4c67193a3004a374ecadb504111d11.tar.gz build_soong-025b4807cb4c67193a3004a374ecadb504111d11.tar.bz2 build_soong-025b4807cb4c67193a3004a374ecadb504111d11.zip | |
Include objs from whole static libs before local objs
This matches the make behavior.
Change-Id: I8265fb481424734062b0fca944cdbbe283b7236d
| -rw-r--r-- | cc/cc.go | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1540,16 +1540,16 @@ func (library *libraryLinker) deps(ctx BaseModuleContext, deps Deps) Deps { func (library *libraryLinker) linkStatic(ctx ModuleContext, flags Flags, deps PathDeps, objFiles common.Paths) common.Path { - objFiles = append(objFiles, deps.WholeStaticLibObjFiles...) - library.objFiles = objFiles + library.objFiles = append(common.Paths{}, deps.WholeStaticLibObjFiles...) + library.objFiles = append(library.objFiles, objFiles...) outputFile := common.PathForModuleOut(ctx, ctx.ModuleName()+library.Properties.VariantName+staticLibraryExtension) if ctx.Darwin() { - TransformDarwinObjToStaticLib(ctx, objFiles, flagsToBuilderFlags(flags), outputFile) + TransformDarwinObjToStaticLib(ctx, library.objFiles, flagsToBuilderFlags(flags), outputFile) } else { - TransformObjToStaticLib(ctx, objFiles, flagsToBuilderFlags(flags), outputFile) + TransformObjToStaticLib(ctx, library.objFiles, flagsToBuilderFlags(flags), outputFile) } library.wholeStaticMissingDeps = ctx.GetMissingDependencies() |