diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-05-10 17:31:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-05-10 17:31:21 -0700 |
| commit | 00ced7675cdc6b6512213c2772ea716283a6f433 (patch) | |
| tree | d311d4b1c7d354adaec933d34aa3760cc3adae72 /cc | |
| parent | f4449451b59dda4e8dfc92ffdffa9dd6aa569a19 (diff) | |
| download | build_soong-00ced7675cdc6b6512213c2772ea716283a6f433.tar.gz build_soong-00ced7675cdc6b6512213c2772ea716283a6f433.tar.bz2 build_soong-00ced7675cdc6b6512213c2772ea716283a6f433.zip | |
Move local ldflags after the toolchain ldflags
This way a local module can override a global flag (like libm
overriding -Wl,--hash-style=)
Change-Id: If32774381fc46b5767f2c13bf45c3a84acb2697e
Diffstat (limited to 'cc')
| -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() { |