diff options
| author | Yu Liu <yudiliu@google.com> | 2022-03-04 15:42:10 -0800 |
|---|---|---|
| committer | Yu Liu <yudiliu@google.com> | 2022-03-18 01:17:08 +0000 |
| commit | 99da0e73ec1ff33d7df65a2068f5af8233b1371a (patch) | |
| tree | 0c766ed5fa36d478bb9b3bbcab4a35391a55d14c /BUILD.bazel | |
| parent | f5be49ec2af0da2d98eeefd471ee149cbf933806 (diff) | |
| download | linux-x86-99da0e73ec1ff33d7df65a2068f5af8233b1371a.tar.gz | |
Move the --target flag into its own feature
Bug: 215748260
Test: Tested using aquery to verify the --target flag; add added unit
tests.
Change-Id: I0aef6d911cf0e80991e97023bd1349e40552e2f7
Change-Id: Ic54a0ad8d40d9688d9b524b819ed650174b2d88e
Diffstat (limited to 'BUILD.bazel')
| -rw-r--r-- | BUILD.bazel | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 750fd9849..201ff395b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -65,9 +65,7 @@ _LIBCLANG_RT_PREBUILT_MAP = { libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_x86_64"], linker_flags = generated_constants.X86_64ToolchainLdflags + generated_constants.X86_64Lldflags, target_arch = arches.X86_64, - target_flags = [ - "--target=x86_64-linux-android10000", - ] + generated_constants.X86_64ToolchainCflags + + target_flags = generated_constants.X86_64ToolchainCflags + generated_constants.X86_64ArchVariantCflags[variant.arch_variant] + expand_feature_flags( variant.arch_variant, @@ -89,9 +87,7 @@ _LIBCLANG_RT_PREBUILT_MAP = { libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_x86"], linker_flags = generated_constants.X86ToolchainLdflags + generated_constants.X86Lldflags, target_arch = arches.X86, - target_flags = [ - "--target=i686-linux-android10000", - ] + generated_constants.X86ToolchainCflags + + target_flags = generated_constants.X86ToolchainCflags + generated_constants.X86ArchVariantCflags[variant.arch_variant] + expand_feature_flags( variant.arch_variant, @@ -116,9 +112,7 @@ _LIBCLANG_RT_PREBUILT_MAP = { [], ) + generated_constants.Arm64Lldflags, target_arch = arches.Arm64, - target_flags = [ - "--target=aarch64-linux-android10000", - ] + generated_constants.Arm64ArchVariantCflags[variant.arch_variant] + + target_flags = generated_constants.Arm64ArchVariantCflags[variant.arch_variant] + generated_constants.Arm64CpuVariantCflags.get( variant.cpu_variant, [], @@ -138,8 +132,7 @@ _LIBCLANG_RT_PREBUILT_MAP = { libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_arm"], linker_flags = generated_constants.ArmLldflags + arm_extra_ldflags(variant), target_arch = arches.Arm, - target_flags = ["--target=" + generated_constants.ArmClangTriple + "10000"] + - generated_constants.ArmToolchainCflags + + target_flags = generated_constants.ArmToolchainCflags + generated_constants.ArmArchVariantCflags[variant.arch_variant] + generated_constants.ArmCpuVariantCflags.get( variant.cpu_variant, |