diff options
Diffstat (limited to 'x86_64_external_files.patch')
| -rw-r--r-- | x86_64_external_files.patch | 132 |
1 files changed, 70 insertions, 62 deletions
diff --git a/x86_64_external_files.patch b/x86_64_external_files.patch index 1f77ebc..7bf4fb3 100644 --- a/x86_64_external_files.patch +++ b/x86_64_external_files.patch @@ -1,3 +1,73 @@ +diff --git a/external/local_config_cc/BUILD b/external/local_config_cc/BUILD +index 6c19fae..a0ea3f8 100755 +--- a/external/local_config_cc/BUILD ++++ b/external/local_config_cc/BUILD +@@ -47,15 +47,15 @@ filegroup( + cc_toolchain_suite( + name = "toolchain", + toolchains = { +- "aarch64|compiler": ":cc-compiler-aarch64", +- "aarch64": ":cc-compiler-aarch64", ++ "k8|compiler": ":cc-compiler-k8", ++ "k8": ":cc-compiler-k8", + "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a", + "armeabi-v7a": ":cc-compiler-armeabi-v7a", + }, + ) + + cc_toolchain( +- name = "cc-compiler-aarch64", ++ name = "cc-compiler-k8", + toolchain_identifier = "local", + toolchain_config = ":local", + all_files = ":compiler_deps", +@@ -72,7 +72,7 @@ cc_toolchain( + + cc_toolchain_config( + name = "local", +- cpu = "aarch64", ++ cpu = "k8", + compiler = "compiler", + toolchain_identifier = "local", + host_system_name = "local", +@@ -80,7 +80,7 @@ cc_toolchain_config( + target_libc = "local", + abi_version = "local", + abi_libc_version = "local", +- cxx_builtin_include_directories = ["/usr/lib/gcc/aarch64-linux-gnu/10.3.1/include", ++ cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-linux-gnu/10.3.1/include", + "/usr/local/include", + "/usr/include", + "/root/rpmbuild/BUILD/ANNC-v0.0.2/annc/service/cpu/xla", +@@ -91,7 +91,7 @@ cc_toolchain_config( + "/root/rpmbuild/BUILD/XNNPACK/build/pthreadpool-source/include", + "/root/rpmbuild/BUILD/ANNC-v0.0.2/output/e7b069029cc648c50e1b8083cef52b4f/external/local_config_cc", + "/usr/include/c++/10.3.1", +- "/usr/include/c++/10.3.1/aarch64-linux-gnu", ++ "/usr/include/c++/10.3.1/x86_64-linux-gnu", + "/usr/include/c++/10.3.1/backward"], + tool_paths = {"ar": "/usr/bin/ar", + "ld": "/usr/bin/ld", +diff --git a/external/local_config_cc/builtin_include_directory_paths b/external/local_config_cc/builtin_include_directory_paths +index 188e6c9..2c3bcc1 100755 +--- a/external/local_config_cc/builtin_include_directory_paths ++++ b/external/local_config_cc/builtin_include_directory_paths +@@ -4,7 +4,7 @@ changes to it will be reflected in the action cache key. When some of these + paths change, Bazel will make sure to rerun the action, even though none of + declared action inputs or the action commandline changes. + +-/usr/lib/gcc/aarch64-linux-gnu/10.3.1/include ++/usr/lib/gcc/x86_64-linux-gnu/10.3.1/include + /usr/local/include + /usr/include + /root/rpmbuild/BUILD/ANNC-v0.0.2/annc/service/cpu/xla +@@ -15,5 +15,5 @@ declared action inputs or the action commandline changes. + /root/rpmbuild/BUILD/XNNPACK/build/pthreadpool-source/include + /root/rpmbuild/BUILD/ANNC-v0.0.2/output/e7b069029cc648c50e1b8083cef52b4f/external/local_config_cc + /usr/include/c++/10.3.1 +-/usr/include/c++/10.3.1/aarch64-linux-gnu ++/usr/include/c++/10.3.1/x86_64-linux-gnu + /usr/include/c++/10.3.1/backward diff --git a/external/go_sdk/BUILD.bazel b/x86_64/external/go_sdk/BUILD.bazel index 9cf6add..511ddbc 100644 --- a/external/go_sdk/BUILD.bazel @@ -44,68 +114,6 @@ index 81bd76b..560f94f 100644 const version = `go1.18.4` const defaultGOOS = runtime.GOOS const defaultGOARCH = runtime.GOARCH -diff --git a/external/local_config_cc/BUILD b/x86_64/external/local_config_cc/BUILD -index 51949c4..89f56ce 100755 ---- a/external/local_config_cc/BUILD -+++ b/x86_64/external/local_config_cc/BUILD -@@ -47,15 +47,15 @@ filegroup( - cc_toolchain_suite( - name = "toolchain", - toolchains = { -- "aarch64|compiler": ":cc-compiler-aarch64", -- "aarch64": ":cc-compiler-aarch64", -+ "k8|compiler": ":cc-compiler-k8", -+ "k8": ":cc-compiler-k8", - "armeabi-v7a|compiler": ":cc-compiler-armeabi-v7a", - "armeabi-v7a": ":cc-compiler-armeabi-v7a", - }, - ) - - cc_toolchain( -- name = "cc-compiler-aarch64", -+ name = "cc-compiler-k8", - toolchain_identifier = "local", - toolchain_config = ":local", - all_files = ":compiler_deps", -@@ -72,7 +72,7 @@ cc_toolchain( - - cc_toolchain_config( - name = "local", -- cpu = "aarch64", -+ cpu = "k8", - compiler = "compiler", - toolchain_identifier = "local", - host_system_name = "local", -@@ -80,11 +80,11 @@ cc_toolchain_config( - target_libc = "local", - abi_version = "local", - abi_libc_version = "local", -- cxx_builtin_include_directories = ["/usr/lib/gcc/aarch64-openEuler-linux/12/include", -+ cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-openEuler-linux/12/include", - "/usr/local/include", - "/usr/include", - "/usr/include/c++/12", -- "/usr/include/c++/12/aarch64-openEuler-linux", -+ "/usr/include/c++/12/x86_64-openEuler-linux", - "/usr/include/c++/12/backward"], - tool_paths = {"ar": "/usr/bin/ar", - "ld": "/usr/bin/ld", -diff --git a/external/local_config_cc/builtin_include_directory_paths b/x86_64/external/local_config_cc/builtin_include_directory_paths -index 711ac34..50fea54 100755 ---- a/external/local_config_cc/builtin_include_directory_paths -+++ b/x86_64/external/local_config_cc/builtin_include_directory_paths -@@ -4,9 +4,9 @@ changes to it will be reflected in the action cache key. When some of these - paths change, Bazel will make sure to rerun the action, even though none of - declared action inputs or the action commandline changes. - --/usr/lib/gcc/aarch64-openEuler-linux/12/include -+/usr/lib/gcc/x86_64-openEuler-linux/12/include - /usr/local/include - /usr/include - /usr/include/c++/12 --/usr/include/c++/12/aarch64-openEuler-linux -+/usr/include/c++/12/x86_64-openEuler-linux - /usr/include/c++/12/backward diff --git a/external/local_config_cc_toolchains/BUILD b/x86_64/external/local_config_cc_toolchains/BUILD index db5234f..f9c0875 100755 --- a/external/local_config_cc_toolchains/BUILD |