StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the platform -std= for sdk_version.

Browse Source 
Bug: http://b/72571399
Test: builds
Change-Id: I294cfadb7de54b1ae648e02ac9af34ed7a7405d8
This commit is contained in:
Elliott Hughes
2018-02-16 17:15:19 -08:00
parent f28e32a2a5
commit 5789ca9f28
2 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cc/compiler.go
View File

@@ -397,7 +397,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.GlobalFlags = append(flags.GlobalFlags, tc.ToolchainCflags()) flags.GlobalFlags = append(flags.GlobalFlags, tc.ToolchainCflags())
} }
if !ctx.useSdk() {
cStd := config.CStdVersion cStd := config.CStdVersion
if String(compiler.Properties.C_std) == "experimental" { if String(compiler.Properties.C_std) == "experimental" {
cStd = config.ExperimentalCStdVersion cStd = config.ExperimentalCStdVersion
@@ -420,10 +419,9 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
// GCC uses an invalid C++14 ABI (emits calls to // GCC uses an invalid C++14 ABI (emits calls to
// __cxa_throw_bad_array_length, which is not a valid C++ RT ABI). // __cxa_throw_bad_array_length, which is not a valid C++ RT ABI).
// http://b/25022512 // http://b/25022512
cppStd = config.GccCppStdVersion
} else if ctx.Host() && !flags.Clang {
// The host GCC doesn't support C++14 (and is deprecated, so likely // The host GCC doesn't support C++14 (and is deprecated, so likely
// never will). Build these modules with C++11. // never will).
// Build these modules with C++11.
cppStd = config.GccCppStdVersion cppStd = config.GccCppStdVersion
} }
@@ -434,7 +432,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.ConlyFlags = append([]string{"-std=" + cStd}, flags.ConlyFlags...) flags.ConlyFlags = append([]string{"-std=" + cStd}, flags.ConlyFlags...)
flags.CppFlags = append([]string{"-std=" + cppStd}, flags.CppFlags...) flags.CppFlags = append([]string{"-std=" + cppStd}, flags.CppFlags...)
}
if ctx.useVndk() { if ctx.useVndk() {
flags.CFlags = append(flags.CFlags, esc(compiler.Properties.Target.Vendor.Cflags)...) flags.CFlags = append(flags.CFlags, esc(compiler.Properties.Target.Vendor.Cflags)...)

3
cc/stl.go
View File

@@ -176,8 +176,7 @@ func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
ndkSrcRoot := android.PathForSource(ctx, "prebuilts/ndk/current/sources/cxx-stl/system/include") ndkSrcRoot := android.PathForSource(ctx, "prebuilts/ndk/current/sources/cxx-stl/system/include")
flags.CFlags = append(flags.CFlags, "-isystem "+ndkSrcRoot.String()) flags.CFlags = append(flags.CFlags, "-isystem "+ndkSrcRoot.String())
case "ndk_libc++_shared", "ndk_libc++_static": case "ndk_libc++_shared", "ndk_libc++_static":
// TODO(danalbert): This really shouldn't be here... // Nothing.
flags.CppFlags = append(flags.CppFlags, "-std=c++11")
case "": case "":
// None or error. // None or error.
if !ctx.toolchain().Bionic() { if !ctx.toolchain().Bionic() {