BoringSSL FIPS build - introduce extraLibFlags and use for STL libs.

Rationale: On non-bionic, stl.go currently adds system libraries to
ldFlags, this causes problems for partialLd rules.  However adding the
same libraries to libFlags breaks some existing modules due to symbol
conflicts as the system libraries are linked before some module code.

Introduced a general mechanism for adding libraries to be linked
last rather than making this STL-specific.

Bug: 134581881
Bug: 137267623
Test: TH
Change-Id: I779f28c6586b3fea85cc6299b686e4fde95262d3
This commit is contained in:
Pete Bentley
2019-08-02 14:02:20 +01:00
committed by Colin Cross
parent 74c9bbacb6
commit 99f2fc27e6
4 changed files with 17 additions and 13 deletions

View File

@@ -67,6 +67,7 @@ func flagsToBuilderFlags(in Flags) builderFlags {
rsFlags: strings.Join(in.rsFlags, " "),
ldFlags: strings.Join(in.LdFlags, " "),
libFlags: strings.Join(in.libFlags, " "),
extraLibFlags: strings.Join(in.extraLibFlags, " "),
tidyFlags: strings.Join(in.TidyFlags, " "),
sAbiFlags: strings.Join(in.SAbiFlags, " "),
yasmFlags: strings.Join(in.YasmFlags, " "),