tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove x86 specific flags from bpf target

Browse source 
Test: cd external/bcc/libbpf-tools && mm

Bug: b/308826679

Change-Id: Ibb76832c4013360b6561a6d3676f35adc9ecde5f

Change-Id: Ibb76832c4013360b6561a6d3676f35adc9ecde5f
This commit is contained in:
AdityaK 2024-01-31 14:31:20 -08:00
parent 0790ce2e56
commit 6cfd07e524
1 changed files with 19 additions and 2 deletions
Show stats 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++* // if set to false, use -std=c++* instead of -std=gnu++*
Gnu_extensions *bool 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 Yacc *YaccProperties
Lex *LexProperties 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.CFlags = append(flags.Global.CFlags, target)
flags.Global.AsFlags = append(flags.Global.AsFlags, target) flags.Global.AsFlags = append(flags.Global.AsFlags, target)
flags.Global.LdFlags = append(flags.Global.LdFlags, 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.AsFlags = append(flags.Global.AsFlags, tc.Asflags())
flags.Global.CppFlags = append([]string{"${config.CommonGlobalCppflags}"}, flags.Global.CppFlags...) 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, flags.Global.CommonFlags = append(flags.Global.CommonFlags,
tc.Cflags(),
"${config.CommonGlobalCflags}", "${config.CommonGlobalCflags}",
fmt.Sprintf("${config.%sGlobalCflags}", hod)) 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.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) cStd := parseCStd(compiler.Properties.C_std)
cppStd := parseCppStd(compiler.Properties.Cpp_std) cppStd := parseCppStd(compiler.Properties.Cpp_std)