diff options
| author | Jingwen Chen <jingwen@google.com> | 2021-09-23 11:27:23 +0000 |
|---|---|---|
| committer | Jingwen Chen <jingwen@google.com> | 2021-09-23 11:44:28 +0000 |
| commit | 183ddbe7a8bacca078baba2bbdbc1a4098d50c03 (patch) | |
| tree | 4a9db202565d8a33761379fe1183c418def0a9ac /BUILD.bazel | |
| parent | 1c1069109f294e9ffbdc1ff8541394ab4b5d941d (diff) | |
| download | linux-x86-183ddbe7a8bacca078baba2bbdbc1a4098d50c03.tar.gz | |
Fix target_cpu value in android_cc_toolchain.
This variable is used for the output directory of the SolibSymlink
action, e.g.
action 'SolibSymlink
_solib_<target cpu>/libbionic_Slibm_Sliblibm_Ubp2build_Ucc_Ulibrary_Ushared_Uunstripped.so'
Outputs: [bazel-out/k8-fastbuild/bin/_solib_<target cpu>/libbionic_Slibm_Sliblibm_Ubp2build_Ucc_Ulibrary_Ushared_Uunstripped]
Before this change, the <target cpu> value was hardcoded, so the
outputs were clobbering each other.
This change also explicitly unsets the unused parameters to the
create_cc_toolchain_config_info constructor -- those values don't seem
to be used in the actions at all. Verified with aquery of //bionic/...
Test: CI, bp2build.sh of all 4 architectures
Bug: 200781945
Change-Id: Ic230a8f19868d7a408a10a16a029b522ca0d0055
Diffstat (limited to 'BUILD.bazel')
| -rw-r--r-- | BUILD.bazel | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index 7d0b23b32..919f9cab2 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -42,6 +42,8 @@ _LIBCLANG_RT_PREBUILT_MAP = { # x86_64 toolchain definition. android_cc_toolchain( name = "cc_toolchain_x86_64", + target_os = "android", + target_arch = "x86_64", clang_version = ":clang", clang_version_directory = generated_constants.CLANG_DEFAULT_VERSION, libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_x86_64"], @@ -75,6 +77,8 @@ toolchain( # TODO(b/186628704): automatically generate from Soong. android_cc_toolchain( name = "cc_toolchain_x86_64_linux_host", + target_os = "linux_glibc", + target_arch = "x86_64", clang_version = ":clang", clang_version_directory = generated_constants.CLANG_DEFAULT_VERSION, libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:linux_glibc_x86_64"], @@ -119,6 +123,8 @@ toolchain( # x86 toolchain definition. android_cc_toolchain( name = "cc_toolchain_x86", + target_os = "android", + target_arch = "x86", clang_version = ":clang", clang_version_directory = generated_constants.CLANG_DEFAULT_VERSION, libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_x86"], @@ -151,6 +157,8 @@ toolchain( # arm64 toolchain definition. android_cc_toolchain( name = "cc_toolchain_arm64", + target_os = "android", + target_arch = "arm64", clang_version = ":clang", clang_version_directory = generated_constants.CLANG_DEFAULT_VERSION, libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_arm64"], @@ -182,6 +190,8 @@ toolchain( # arm32 toolchain definition. android_cc_toolchain( name = "cc_toolchain_arm32", + target_os = "android", + target_arch = "arm", clang_version = ":clang", clang_version_directory = generated_constants.CLANG_DEFAULT_VERSION, libclang_rt_builtin = _LIBCLANG_RT_PREBUILT_MAP["//build/bazel/platforms/os_arch:android_arm"], |