aboutsummaryrefslogtreecommitdiffstats
path: root/cc/builder.go
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2018-02-10 01:44:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-02-10 01:44:23 +0000
commit2d3e445c3a41ee0f87cca0a7a7396024731fdea5 (patch)
treedd6e9d27f284b09f23df61f441af99e0a2c6a75b /cc/builder.go
parenta3cd089ffaa6efdf2bfa6ace5cd4a0470fcfcdd6 (diff)
parent4917049f6efe2d08e67eb26ec77e21dcce5172c5 (diff)
downloadbuild_soong-2d3e445c3a41ee0f87cca0a7a7396024731fdea5.tar.gz
build_soong-2d3e445c3a41ee0f87cca0a7a7396024731fdea5.tar.bz2
build_soong-2d3e445c3a41ee0f87cca0a7a7396024731fdea5.zip
Merge "Fix llvm-ar error caused by using lto and sanitizer together"
Diffstat (limited to 'cc/builder.go')
-rw-r--r--cc/builder.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/cc/builder.go b/cc/builder.go
index 06461324..279c1da7 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -256,6 +256,7 @@ type builderFlags struct {
systemIncludeFlags string
groupStaticLibs bool
+ arGoldPlugin bool
stripKeepSymbols bool
stripKeepMiniDebugInfo bool
@@ -512,6 +513,9 @@ func TransformObjToStaticLib(ctx android.ModuleContext, objFiles android.Paths,
if !ctx.Darwin() {
arFlags += " -format=gnu"
}
+ if flags.arGoldPlugin {
+ arFlags += " --plugin ${config.LLVMGoldPlugin}"
+ }
if flags.arFlags != "" {
arFlags += " " + flags.arFlags
}