Skip to content

Commit 1ab66fe

Browse files
committed
Rename k8_jetson_nano_cross_compile to k8_aarch64_linux
1 parent 686dfaa commit 1ab66fe

15 files changed

Lines changed: 47 additions & 73 deletions

src/MODULE.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,13 @@ http_archive(
215215
register_toolchains("//toolchains/python:py_toolchain")
216216

217217
register_toolchains(
218-
"//toolchains/python:k8_jetson_nano_cross_compile_py_cc_toolchain",
218+
"//toolchains/python:k8_aarch64_linux_py_cc_toolchain",
219219
"//toolchains/python:py_cc_toolchain_host_x86_64",
220220
"//toolchains/python:py_cc_toolchain_host_aarch64",
221221
)
222222

223223
register_toolchains(
224-
"//toolchains/cc:cc_toolchain_for_k8_jetson_nano_cross_compile",
224+
"//toolchains/cc:cc_toolchain_for_k8_aarch64_linux",
225225
"//toolchains/cc:cc_toolchain_for_k8",
226226
"//toolchains/cc:cc_toolchain_for_aarch64",
227227
)
@@ -251,8 +251,8 @@ new_local_repository(
251251
)
252252

253253
new_local_repository(
254-
name = "k8_jetson_nano_cross_compile_gcc",
255-
build_file = "@//extlibs:k8_jetson_nano_cross_compile_gcc.BUILD",
254+
name = "k8_aarch64_linux_gcc",
255+
build_file = "@//extlibs:k8_aarch64_linux_gcc.BUILD",
256256
path = "/opt/tbotspython/aarch64-tbots-linux-gnu/",
257257
)
258258

@@ -263,7 +263,7 @@ new_local_repository(
263263
)
264264

265265
new_local_repository(
266-
name = "py_cc_toolchain_for_k8_jetson_nano_cross_compile",
266+
name = "py_cc_toolchain_for_k8_aarch64_linux",
267267
build_file = "@//extlibs:py_cc_toolchain.BUILD",
268268
path = "/opt/tbotspython/cross_compile_headers/include/python3.12/",
269269
)

src/extlibs/k8_jetson_nano_cross_compile_gcc.BUILD

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/toolchains/cc/BUILD

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load(
22
":cc_toolchain_config.bzl",
33
"cc_toolchain_config_fullsystem",
4-
"cc_toolchain_config_k8_jetson_nano_cross_compile",
4+
"cc_toolchain_config_k8_aarch64_linux",
55
"make_builtin_include_directories",
66
)
77

@@ -10,7 +10,7 @@ package(default_visibility = ["//visibility:public"])
1010
# Create environments for each CPU this toolchain supports
1111
environment(name = "k8")
1212

13-
environment(name = "k8_jetson_nano_cross_compile")
13+
environment(name = "k8_aarch64_linux")
1414

1515
environment(name = "aarch64")
1616

@@ -19,12 +19,12 @@ environment_group(
1919
defaults = [
2020
":aarch64",
2121
":k8",
22-
":k8_jetson_nano_cross_compile",
22+
":k8_aarch64_linux",
2323
],
2424
environments = [
2525
":aarch64",
2626
":k8",
27-
":k8_jetson_nano_cross_compile",
27+
":k8_aarch64_linux",
2828
],
2929
)
3030

@@ -39,8 +39,8 @@ config_setting(
3939
)
4040

4141
config_setting(
42-
name = "cpu_k8_jetson_nano_cross_compile",
43-
values = {"cpu": "k8_jetson_nano_cross_compile"},
42+
name = "cpu_k8_aarch64_linux",
43+
values = {"cpu": "k8_aarch64_linux"},
4444
)
4545

4646
# Create a constraint for the glibc version to target the correct glibc version for the robot
@@ -70,9 +70,9 @@ cc_toolchain_suite(
7070
# aarch64 is for ARM64 systems and the robot
7171
"aarch64": "cc_toolchain_linux_aarch64_gcc",
7272
"aarch64|compiler": "cc_toolchain_linux_aarch64_gcc",
73-
# jetson nano 4GB system
74-
"k8_jetson_nano_cross_compile": "cc_toolchain_k8_jetson_nano_cross_compile",
75-
"k8_jetson_nano_cross_compile|compiler": "cc_toolchain_k8_jetson_nano_cross_compile",
73+
# cross compile on x86 for arm64 (the robot)
74+
"k8_aarch64_linux": "cc_toolchain_k8_aarch64_linux",
75+
"k8_aarch64_linux|compiler": "cc_toolchain_k8_aarch64_linux",
7676
},
7777
)
7878

@@ -82,10 +82,10 @@ filegroup(
8282
)
8383

8484
filegroup(
85-
name = "k8_jetson_nano_cross_compile_everything",
85+
name = "k8_aarch64_linux_everything",
8686
srcs = [
87-
"@k8_jetson_nano_cross_compile_gcc//:everything",
88-
] + glob(["wrapper/k8_jetson_nano_cross_compile_*"]),
87+
"@k8_aarch64_linux_gcc//:everything",
88+
] + glob(["wrapper/k8_aarch64_linux_*"]),
8989
)
9090

9191
filegroup(
@@ -177,55 +177,55 @@ cc_toolchain(
177177
)
178178

179179
cc_toolchain(
180-
name = "cc_toolchain_k8_jetson_nano_cross_compile",
181-
all_files = ":k8_jetson_nano_cross_compile_everything",
182-
ar_files = ":k8_jetson_nano_cross_compile_everything",
183-
as_files = ":k8_jetson_nano_cross_compile_everything",
184-
compiler_files = ":k8_jetson_nano_cross_compile_everything",
180+
name = "cc_toolchain_k8_aarch64_linux",
181+
all_files = ":k8_aarch64_linux_everything",
182+
ar_files = ":k8_aarch64_linux_everything",
183+
as_files = ":k8_aarch64_linux_everything",
184+
compiler_files = ":k8_aarch64_linux_everything",
185185
dwp_files = ":empty",
186-
linker_files = ":k8_jetson_nano_cross_compile_everything",
186+
linker_files = ":k8_aarch64_linux_everything",
187187
objcopy_files = ":empty",
188188
strip_files = ":empty",
189189
supports_param_files = 0,
190190
# We add this tag to circumvent a bug in the CLion bazel plugin. It should be removed
191191
# when possible
192192
# https://github.com/bazelbuild/intellij/issues/486
193193
tags = ["no-ide"],
194-
toolchain_config = ":gcc_k8_jetson_nano_cross_compile",
195-
toolchain_identifier = "gcc-k8-jetson-nano-cross-compile",
194+
toolchain_config = ":gcc_k8_aarch64_linux",
195+
toolchain_identifier = "gcc-k8-aarch64-linux",
196196
)
197197

198-
cc_toolchain_config_k8_jetson_nano_cross_compile(
199-
name = "gcc_k8_jetson_nano_cross_compile",
198+
cc_toolchain_config_k8_aarch64_linux(
199+
name = "gcc_k8_aarch64_linux",
200200
builtin_include_directories = [
201201
"/opt/tbotspython/aarch64-tbots-linux-gnu/aarch64-tbots-linux-gnu/include/",
202202
"/opt/tbotspython/aarch64-tbots-linux-gnu/aarch64-tbots-linux-gnu/sysroot/usr/include/",
203203
"/opt/tbotspython/aarch64-tbots-linux-gnu/lib/gcc/aarch64-tbots-linux-gnu/8.5.0/include/",
204204
"/opt/tbotspython/aarch64-tbots-linux-gnu/lib/gcc/aarch64-tbots-linux-gnu/8.5.0/include-fixed",
205205
] + make_builtin_include_directories(),
206206
tool_paths = {
207-
"ar": "wrapper/k8_jetson_nano_cross_compile_ar",
208-
"cpp": "wrapper/k8_jetson_nano_cross_compile_cpp",
209-
"dwp": "wrapper/k8_jetson_nano_cross_compile_dwp",
210-
"gcc": "wrapper/k8_jetson_nano_cross_compile_gcc",
211-
"gcov": "wrapper/k8_jetson_nano_cross_compile_gcov",
212-
"ld": "wrapper/k8_jetson_nano_cross_compile_ld",
213-
"nm": "wrapper/k8_jetson_nano_cross_compile_nm",
214-
"objcopy": "wrapper/k8_jetson_nano_cross_compile_objcopy",
215-
"objdump": "wrapper/k8_jetson_nano_cross_compile_objdump",
216-
"strip": "wrapper/k8_jetson_nano_cross_compile_strip",
207+
"ar": "wrapper/k8_aarch64_linux_ar",
208+
"cpp": "wrapper/k8_aarch64_linux_cpp",
209+
"dwp": "wrapper/k8_aarch64_linux_dwp",
210+
"gcc": "wrapper/k8_aarch64_linux_gcc",
211+
"gcov": "wrapper/k8_aarch64_linux_gcov",
212+
"ld": "wrapper/k8_aarch64_linux_ld",
213+
"nm": "wrapper/k8_aarch64_linux_nm",
214+
"objcopy": "wrapper/k8_aarch64_linux_objcopy",
215+
"objdump": "wrapper/k8_aarch64_linux_objdump",
216+
"strip": "wrapper/k8_aarch64_linux_strip",
217217
},
218-
toolchain_identifier = "gcc-k8-jetson_nano-cross-compile",
218+
toolchain_identifier = "gcc-k8-aarch64-linux",
219219
)
220220

221221
toolchain(
222-
name = "cc_toolchain_for_k8_jetson_nano_cross_compile",
222+
name = "cc_toolchain_for_k8_aarch64_linux",
223223
target_compatible_with = [
224224
"@platforms//cpu:aarch64",
225225
"@platforms//os:linux",
226226
":glibc_2_27",
227227
],
228-
toolchain = ":cc_toolchain_k8_jetson_nano_cross_compile",
228+
toolchain = ":cc_toolchain_k8_aarch64_linux",
229229
toolchain_type = "@bazel_tools//tools/cpp:toolchain_type",
230230
)
231231

src/toolchains/cc/cc_toolchain_config.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ cc_toolchain_config_fullsystem = rule(
614614
executable = True,
615615
)
616616

617-
def _k8_jetson_nano_cross_compile_impl(ctx):
617+
def _k8_aarch64_linux_impl(ctx):
618618
host_system_name = "k8"
619619

620620
action_configs = []
@@ -727,8 +727,8 @@ def _k8_jetson_nano_cross_compile_impl(ctx):
727727
),
728728
]
729729

730-
cc_toolchain_config_k8_jetson_nano_cross_compile = rule(
731-
implementation = _k8_jetson_nano_cross_compile_impl,
730+
cc_toolchain_config_k8_aarch64_linux = rule(
731+
implementation = _k8_aarch64_linux_impl,
732732
attrs = {
733733
"builtin_include_directories": attr.string_list(),
734734
"extra_no_canonical_prefixes_flags": attr.string_list(),
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)