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

Merge "Remove x86 specific flags from bpf target" into main am: 14b5f6e05b

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

Change-Id: I4121d695a8a861084044ec8ca58156d8dcf210f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aditya Kumar
2024-02-02 06:40:38 +00:00
committed by Automerger Merge Worker
parent 35ecf23c13 14b5f6e05b
commit 0dd6a2c0a3
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cc/compiler.go
View File

@@ -116,6 +116,10 @@ type BaseCompilerProperties struct {
// if set to false, use -std=c++* instead of -std=gnu++*
Gnu_extensions *bool
// cc Build rules targeting BPF must set this to true. The correct fix is to
// ban targeting bpf in cc rules instead use bpf_rules. (b/323415017)
Bpf_target *bool
Yacc *YaccProperties
Lex *LexProperties
@@ -483,6 +487,11 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
}
}
// bpf targets don't need the default target triple. b/308826679
if proptools.Bool(compiler.Properties.Bpf_target) {
target = "--target=bpf"
}
flags.Global.CFlags = append(flags.Global.CFlags, target)
flags.Global.AsFlags = append(flags.Global.AsFlags, target)
flags.Global.LdFlags = append(flags.Global.LdFlags, target)
@@ -498,8 +507,12 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.Global.AsFlags = append(flags.Global.AsFlags, tc.Asflags())
flags.Global.CppFlags = append([]string{"${config.CommonGlobalCppflags}"}, flags.Global.CppFlags...)
// bpf targets don't need the target specific toolchain cflags. b/308826679
if !proptools.Bool(compiler.Properties.Bpf_target) {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, tc.Cflags())
}
flags.Global.CommonFlags = append(flags.Global.CommonFlags,
tc.Cflags(),
"${config.CommonGlobalCflags}",
fmt.Sprintf("${config.%sGlobalCflags}", hod))
@@ -521,7 +534,11 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.Global.YasmFlags = append(flags.Global.YasmFlags, tc.YasmFlags())
flags.Global.CommonFlags = append(flags.Global.CommonFlags, tc.ToolchainCflags())
// bpf targets don't need the target specific toolchain cflags. b/308826679
if !proptools.Bool(compiler.Properties.Bpf_target) {
flags.Global.CommonFlags = append(flags.Global.CommonFlags, tc.ToolchainCflags())
}
cStd := parseCStd(compiler.Properties.C_std)
cppStd := parseCppStd(compiler.Properties.Cpp_std)