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"

Browse Source 
am: ac6697420a

* commit 'ac6697420aebc6e7f98d5a73c8d4c525bf8de419':
  Move local ldflags after the toolchain ldflags

Change-Id: I4c2a0173026f86a215749b3031ae5da49b2ca0f9
This commit is contained in:
Dan Willemsen
2016-05-11 01:33:18 +00:00
committed by android-build-merger
parent 90473092fe ac6697420a
commit dbec7035e6
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() {