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" am: 104ecf6708 am: baeeb601cc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1980008

Change-Id: Idec89215c8a214230568f2bb2027c6a83d59b5be
This commit is contained in:
Treehugger Robot
2022-02-11 14:27:55 +00:00
committed by Automerger Merge Worker
parent 9da60d7951 baeeb601cc
commit ca7d468a5d
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 package config
import ( import (
"fmt"
"strings" "strings"
"android/soong/android" "android/soong/android"
@@ -190,6 +191,11 @@ func (toolchainX86_64) LibclangRuntimeLibraryArch() string {
} }
func x86_64ToolchainFactory(arch android.Arch) Toolchain { 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{ toolchainCflags := []string{
"${config.X86_64ToolchainCflags}", "${config.X86_64ToolchainCflags}",
"${config.X86_64" + arch.ArchVariant + "VariantCflags}", "${config.X86_64" + arch.ArchVariant + "VariantCflags}",

6
cc/config/x86_device.go
View File

@@ -15,6 +15,7 @@
package config package config
import ( import (
"fmt"
"strings" "strings"
"android/soong/android" "android/soong/android"
@@ -186,6 +187,11 @@ func (toolchainX86) LibclangRuntimeLibraryArch() string {
} }
func x86ToolchainFactory(arch android.Arch) Toolchain { 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{ toolchainCflags := []string{
"${config.X86ToolchainCflags}", "${config.X86ToolchainCflags}",
"${config.X86" + arch.ArchVariant + "VariantCflags}", "${config.X86" + arch.ArchVariant + "VariantCflags}",