Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow setting platform constraints with --exec_constraints #968

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow setting platform constraints with --exec_constraints #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9ff4cd
Allow setting platform constraints with --exec_constraints
coeuvre Aug 16, 2021
39f6363
Fix tests
coeuvre Aug 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/rbe_configs_gen/rbe_configs_gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"fmt"
"log"
"os"
"strings"

"github.com/bazelbuild/bazel-toolchains/pkg/monitoring"
"github.com/bazelbuild/bazel-toolchains/pkg/rbeconfigsgen"
Expand Down Expand Up @@ -50,6 +51,7 @@ var (
cppToolchainTarget = flag.String("cpp_toolchain_target", "", "(Optional) Set the CPP toolchain target. When exec_os is linux, the default is cc-compiler-k8. When exec_os is windows, the default is cc-compiler-x64_windows.")
genJavaConfigs = flag.Bool("generate_java_configs", true, "(Optional) Generate Java configs. Defaults to true.")
javaUseLocalRuntime = flag.Bool("java_use_local_runtime", false, "(Optional) Make the generated java toolchain use the new local_java_runtime rule instead of java_runtime. Otherwise, the Bazel version will be used to infer which rule to use.")
execConstraints = flag.String("exec_constraints", "", "(Optional) Set the platform constraint values. Use ',' to seperate multiple values.")

// Other misc arguments.
tempWorkDir = flag.String("temp_work_dir", "", "(Optional) Temporary directory to use to store intermediate files. Defaults to a temporary directory automatically allocated by the OS. The temporary working directory is deleted at the end unless --cleanup=false is specified.")
Expand Down Expand Up @@ -155,6 +157,9 @@ func main() {
log.Fatalf("Failed to initialize monitoring: %v", err)
}

platformParams := new(rbeconfigsgen.PlatformToolchainsTemplateParams)
platformParams.ExecConstraints = strings.Split(*execConstraints, ",")

o := rbeconfigsgen.Options{
BazelVersion: *bazelVersion,
BazelPath: *bazelPath,
Expand All @@ -168,6 +173,7 @@ func main() {
OutputManifest: *outputManifest,
GenCPPConfigs: *genCppConfigs,
CppGenEnvJSON: *cppEnvJSON,
PlatformParams: platformParams,
CPPToolchainTargetName: *cppToolchainTarget,
GenJavaConfigs: *genJavaConfigs,
JavaUseLocalRuntime: *javaUseLocalRuntime,
Expand Down
13 changes: 11 additions & 2 deletions pkg/rbeconfigsgen/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,17 @@ func (o *Options) ApplyDefaults(os string) error {
if !ok {
return fmt.Errorf("got unknown OS %q, want one of %s", os, strings.Join(validOS, ", "))
}
o.PlatformParams = new(PlatformToolchainsTemplateParams)
*o.PlatformParams = dopts.PlatformParams

if o.PlatformParams == nil {
o.PlatformParams = new(PlatformToolchainsTemplateParams)
}

if len(o.PlatformParams.ExecConstraints) == 0 {
o.PlatformParams.ExecConstraints = dopts.PlatformParams.ExecConstraints
}
o.PlatformParams.TargetConstraints = dopts.PlatformParams.TargetConstraints
o.PlatformParams.OSFamily = dopts.PlatformParams.OSFamily

o.CPPConfigTargets = dopts.CPPConfigTargets
o.CPPConfigRepo = dopts.CPPConfigRepo
o.CppBazelCmd = dopts.CppBazelCmd
Expand Down
Loading