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

Merge "Move local ldflags after the toolchain ldflags" am: ac6697420a am: dbec7035e6

Browse Source 
am: 3040e468aa

* commit '3040e468aacf8bb5a70735f34501f51138512870':
  Move local ldflags after the toolchain ldflags

Change-Id: I3be4f2785b534f32fead6683663c32d21ddeef12
This commit is contained in:
Dan Willemsen
2016-05-11 01:38:31 +00:00
committed by android-build-merger
parent 5e1d8e538e 3040e468aa
commit 92fac77f74
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/cc.go
View File

@@ -1258,8 +1258,6 @@ func (linker *baseLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
func (linker *baseLinker) flags(ctx ModuleContext, flags Flags) Flags {
toolchain := ctx.toolchain()
flags.LdFlags = append(flags.LdFlags, linker.Properties.Ldflags...)
if !ctx.noDefaultCompilerFlags() {
if ctx.Device() && !Bool(linker.Properties.Allow_undefined_symbols) {
flags.LdFlags = append(flags.LdFlags, "-Wl,--no-undefined")
@@ -1276,6 +1274,8 @@ func (linker *baseLinker) flags(ctx ModuleContext, flags Flags) Flags {
}
}
flags.LdFlags = append(flags.LdFlags, linker.Properties.Ldflags...)
if ctx.Host() && !linker.static() {
rpath_prefix := `\$$ORIGIN/`
if ctx.Darwin() {