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

Merge "Add error message for unsupported x86 arch variant"

Browse Source
This commit is contained in:
Treehugger Robot
2022-02-11 13:55:43 +00:00
committed by Gerrit Code Review
parent d107272436 f610a74f4c
commit 104ecf6708
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/config/x86_64_device.go
View File

@@ -15,6 +15,7 @@
package config
import (
"fmt"
"strings"
"android/soong/android"
@@ -190,6 +191,11 @@ func (toolchainX86_64) LibclangRuntimeLibraryArch() string {
}
func x86_64ToolchainFactory(arch android.Arch) Toolchain {
// Error now rather than having a confusing Ninja error
if _, ok := x86_64ArchVariantCflags[arch.ArchVariant]; !ok {
panic(fmt.Sprintf("Unknown x86_64 architecture version: %q", arch.ArchVariant))
}
toolchainCflags := []string{
"${config.X86_64ToolchainCflags}",
"${config.X86_64" + arch.ArchVariant + "VariantCflags}",

6
cc/config/x86_device.go
View File

@@ -15,6 +15,7 @@
package config
import (
"fmt"
"strings"
"android/soong/android"
@@ -186,6 +187,11 @@ func (toolchainX86) LibclangRuntimeLibraryArch() string {
}
func x86ToolchainFactory(arch android.Arch) Toolchain {
// Error now rather than having a confusing Ninja error
if _, ok := x86ArchVariantCflags[arch.ArchVariant]; !ok {
panic(fmt.Sprintf("Unknown x86 architecture version: %q", arch.ArchVariant))
}
toolchainCflags := []string{
"${config.X86ToolchainCflags}",
"${config.X86" + arch.ArchVariant + "VariantCflags}",