diff options
| author | Sam Delmerico <delmerico@google.com> | 2022-09-22 13:52:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-09-22 13:52:21 +0000 |
| commit | 257c287c9141a23f6f9d521068ebdaed366ecada (patch) | |
| tree | b7b4dcadde91c895c5dff3e9cf54c0fba97f3528 /BUILD.bazel | |
| parent | 855d2769ce9f5d5c8a9602061581a1fc006e9c31 (diff) | |
| parent | 2e58ce934e252a407561962a36dd0a0fd3901b63 (diff) | |
| download | linux-x86-257c287c9141a23f6f9d521068ebdaed366ecada.tar.gz | |
Merge "collect toolchain definitions into single function"
Diffstat (limited to 'BUILD.bazel')
| -rw-r--r-- | BUILD.bazel | 62 |
1 files changed, 9 insertions, 53 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 839948f20..eebd43b7d 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -14,6 +14,7 @@ load( "android_cc_toolchain", "clang_version", "expand_feature_flags", + "toolchain_definition", ) load( ":cc_toolchain_constants.bzl", @@ -201,61 +202,16 @@ android_cc_toolchain( toolchain_type(name = "nocrt_toolchain") -# Device toolchains with crt libraries +# Device toolchains [ [ - toolchain( - name = "cc_toolchain_{arch}{variant}_def".format( - arch = arch, - variant = variant_name(variant), - ), - exec_compatible_with = [ - "//build/bazel/platforms/arch:x86_64", - "//build/bazel/platforms/os:linux", - ], - target_compatible_with = [ - "//build/bazel/platforms/arch:%s" % arch, - "//build/bazel/platforms/os:android", - ] + variant_constraints( - variant, - _arch_constants.AndroidArchToVariantToFeatures[arch], - ), - toolchain = ":cc_toolchain_{arch}{variant}".format( - arch = arch, - variant = variant_name(variant), - ), - toolchain_type = "@bazel_tools//tools/cpp:toolchain_type", - ) - for variant in variants - ] - for arch, variants in arch_to_variants.items() -] - -# Device toolchains without crt libraries -[ - [ - toolchain( - name = "cc_toolchain_{arch}{variant}_nocrt_def".format( - arch = arch, - variant = variant_name(variant), - ), - exec_compatible_with = [ - "//build/bazel/platforms/arch:x86_64", - "//build/bazel/platforms/os:linux", - ], - target_compatible_with = [ - "//build/bazel/platforms/arch:%s" % arch, - "//build/bazel/platforms/os:android", - ] + variant_constraints( - variant, - _arch_constants.AndroidArchToVariantToFeatures[arch], - ), - toolchain = ":cc_toolchain_{arch}{variant}_nocrt".format( - arch = arch, - variant = variant_name(variant), - ), - toolchain_type = ":nocrt_toolchain", - ) + [ + toolchain_definition(arch, variant, nocrt) + for nocrt in [ + True, + False, + ] + ] for variant in variants ] for arch, variants in arch_to_variants.items() |