diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-27 22:27:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-27 22:27:20 +0000 |
| commit | 1284c67ecb6a3c13004645229600b2f6bd7d94cf (patch) | |
| tree | 291795eb9c90fbf23b8e7790c4292f314610d170 /rules/cc | |
| parent | 74a67000a87d51eb2d530e3cd0b48112b1787eb0 (diff) | |
| parent | 80b5d5de991a0c590f13b732bf2b7daeef7a7947 (diff) | |
| download | bazel-1284c67ecb6a3c13004645229600b2f6bd7d94cf.tar.gz | |
Merge "Remove is_target_<arch> functions"
Diffstat (limited to 'rules/cc')
| -rw-r--r-- | rules/cc/yasm.bzl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/rules/cc/yasm.bzl b/rules/cc/yasm.bzl index fd3076ba..5820784c 100644 --- a/rules/cc/yasm.bzl +++ b/rules/cc/yasm.bzl @@ -19,20 +19,17 @@ load("//build/bazel/platforms:platform_utils.bzl", "platforms") """Build rule for converting `.asm` files to `.o` files with yasm.""" def globalFlags(ctx): - x86 = platforms.is_target_x86(ctx.attr._platform_utils) - x86_64 = platforms.is_target_x86_64(ctx.attr._platform_utils) - arm = platforms.is_target_arm(ctx.attr._platform_utils) - arm64 = platforms.is_target_arm64(ctx.attr._platform_utils) + arch = platforms.get_target_arch(ctx.attr._platform_utils) linux = platforms.is_target_linux_or_android(ctx.attr._platform_utils) darwin = platforms.is_target_darwin(ctx.attr._platform_utils) - if linux and x86_64: + if linux and arch == "x86_64": return ["-f", "elf64", "-m", "amd64"] - if linux and x86: + if linux and arch == "x86": return ["-f", "elf32", "-m", "x86"] - if linux and arm64: + if linux and arch == "arm64": return ["-f", "elf64", "-m", "aarch64"] - if linux and arm: + if linux and arch == "arm": return ["-f", "elf32", "-m", "arm"] if darwin: return ["-f", "macho", "-m", "amd64"] |