diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-11 01:27:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-11 01:27:50 +0000 |
| commit | ac6697420aebc6e7f98d5a73c8d4c525bf8de419 (patch) | |
| tree | 32519d0ef24afa15804ef9d118815c0d859300d6 | |
| parent | 8a35405d330ed9f69f6a34ca6d5e75ccc2c64540 (diff) | |
| parent | 00ced7675cdc6b6512213c2772ea716283a6f433 (diff) | |
| download | build_soong-ac6697420aebc6e7f98d5a73c8d4c525bf8de419.tar.gz build_soong-ac6697420aebc6e7f98d5a73c8d4c525bf8de419.tar.bz2 build_soong-ac6697420aebc6e7f98d5a73c8d4c525bf8de419.zip | |
Merge "Move local ldflags after the toolchain ldflags"
| -rw-r--r-- | cc/cc.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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() { |