From 9d01899322044409fa5d47b25161a80bc570a385 Mon Sep 17 00:00:00 2001 From: Joshua Haberman Date: Tue, 15 Feb 2022 18:02:10 -0800 Subject: [PATCH] Changes to build aarch64 under manylinux. --- toolchain/BUILD | 9 +++++---- toolchain/cc_toolchain_config.bzl | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/toolchain/BUILD b/toolchain/BUILD index 467d1a5df7f0..ff2b51542ae6 100644 --- a/toolchain/BUILD +++ b/toolchain/BUILD @@ -44,15 +44,16 @@ cc_toolchain_config( bit_flag = "-m64", cpp_flag = "-lstdc++", extra_compiler_flags = [ - "-I/usr/aarch64-linux-gnu/include/c++/8/aarch64-linux-gnu/", - "-I/usr/aarch64-linux-gnu/include/c++/8" + "-I/opt/manylinux/2014/aarch64/usr/include/c++/10/aarch64-redhat-linux", + "-I/opt/manylinux/2014/aarch64/usr/include/c++/10" ], - extra_include = "/usr/include", + sysroot = "/opt/manylinux/2014/aarch64", linker_path = "/usr/bin/ld", target_cpu = "aarch64", target_full_name = "aarch64-linux-gnu", - toolchain_dir = "/usr/aarch64-linux-gnu/include", toolchain_name = "linux_aarch_64", + # Don't really need this, setting it because it's required. + toolchain_dir = "/opt/manylinux/2014/aarch64/usr/include", ) cc_toolchain_config( diff --git a/toolchain/cc_toolchain_config.bzl b/toolchain/cc_toolchain_config.bzl index 1d54c1d70dab..27fe274e6ed5 100644 --- a/toolchain/cc_toolchain_config.bzl +++ b/toolchain/cc_toolchain_config.bzl @@ -108,7 +108,7 @@ def _impl(ctx): enabled = (ctx.attr.sysroot != ""), flag_sets = [ flag_set( - actions = all_link_actions, + actions = all_link_actions + all_compile_actions, flag_groups = [ flag_group( flags = [