Fix missing ar tool.

setup_toolchains.py

@@ -37,16 +37,32 @@
     },
 }
 
-_ALL_TOOLS = [
-    'ar',
-    'cpp',
-    'gcc',
-    'gcov',
-    'ld',
-    'nm',
-    'objdump',
-    'strip',
-]
+_ALL_TOOLS = {
+    'ar': {
+        'buildroot_name': 'ar'
+    },
+    'cpp': {
+        'buildroot_name': 'cpp.br_real'
+    },
+    'gcc': {
+        'buildroot_name': 'gcc.br_real'
+    },
+    'gcov': {
+        'buildroot_name': 'gcov'
+    },
+    'ld': {
+        'buildroot_name': 'ld'
+    },
+    'nm': {
+        'buildroot_name': 'nm'
+    },
+    'objdump': {
+        'buildroot_name': 'objdump'
+    },
+    'strip': {
+        'buildroot_name': 'strip'
+    },
+}
 
 
 def create_wrappers(wrapper_dir):
@@ -56,31 +72,31 @@ def create_wrappers(wrapper_dir):
     except FileExistsError:
       pass
 
-    for version, info in buildroot_versions.items():
+    for version, version_info in buildroot_versions.items():
       try:
         os.mkdir(os.path.join(wrapper_dir, arch, version))
       except FileExistsError:
         pass
 
-      for tool in _ALL_TOOLS:
+      for tool, tool_info in _ALL_TOOLS.items():
         toolchain_name = f'{arch}-linux-gnu-{version}'
         wrapper_name = f'{toolchain_name}-{tool}'
-        actual_tool_name = f'{info["tool_prefix"]}-{tool}'
+        actual_tool_name = f'{version_info["tool_prefix"]}-{tool_info["buildroot_name"]}'
         wrapper_path = os.path.join(wrapper_dir, arch, version, wrapper_name)
 
         with open(wrapper_path, 'w') as f:
           f.write('#!/bin/bash\n')
           # Uses buildroot's ".br_real" wrapper to allow -no-canonical-prefix,
           # -fno-canonical-system-headers, and --sysroot to correctly work (using relative paths).
-          f.write(f'exec external/{toolchain_name}/bin/{actual_tool_name}.br_real $@\n')
+          f.write(f'exec external/{toolchain_name}/bin/{actual_tool_name} $@\n')
 
         os.chmod(wrapper_path, 0o777)
 
 
 def write_toolchain_info(filename):
   with open(filename, 'w') as f:
     f.write('AVAILABLE_TOOLCHAINS = {}\n'.format(str(_AVAILABLE_TOOLCHAINS).replace('\'', '"')))
-    f.write('ALL_TOOLS = {}\n'.format(str(_ALL_TOOLS).replace('\'', '"')))
+    f.write('ALL_TOOLS = {}\n'.format(str(list(_ALL_TOOLS)).replace('\'', '"')))
 
 
 def write_test_script(filename):

toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ar

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-ar.br_real $@
+exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-ar $@

toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-gcov

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-gcov.br_real $@
+exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-gcov $@

toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-ld

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-ld.br_real $@
+exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-ld $@

toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-nm

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-nm.br_real $@
+exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-nm $@

toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-objdump

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-objdump.br_real $@
+exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-objdump $@

toolchains/tool_wrappers/aarch64/2020.08-1/aarch64-linux-gnu-2020.08-1-strip

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-strip.br_real $@
+exec external/aarch64-linux-gnu-2020.08-1/bin/aarch64-buildroot-linux-gnu-strip $@

toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ar

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-ar.br_real $@
+exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-ar $@

toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-gcov

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-gcov.br_real $@
+exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-gcov $@

toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-ld

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-ld.br_real $@
+exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-ld $@

toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-nm

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-nm.br_real $@
+exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-nm $@

toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-objdump

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-objdump.br_real $@
+exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-objdump $@

toolchains/tool_wrappers/aarch64/2021.11-1/aarch64-linux-gnu-2021.11-1-strip

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-strip.br_real $@
+exec external/aarch64-linux-gnu-2021.11-1/bin/aarch64-buildroot-linux-gnu-strip $@

toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ar

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ar.br_real $@
+exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ar $@

toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-gcov

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-gcov.br_real $@
+exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-gcov $@

toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-ld

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ld.br_real $@
+exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-ld $@

toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-nm

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-nm.br_real $@
+exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-nm $@

toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-objdump

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-objdump.br_real $@
+exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-objdump $@

toolchains/tool_wrappers/armv7-eabihf/2020.08-1/armv7-eabihf-linux-gnu-2020.08-1-strip

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-strip.br_real $@
+exec external/armv7-eabihf-linux-gnu-2020.08-1/bin/arm-buildroot-linux-gnueabihf-strip $@

toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ar

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-ar.br_real $@
+exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-ar $@

toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-gcov

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-gcov.br_real $@
+exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-gcov $@

toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-ld

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-ld.br_real $@
+exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-ld $@

toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-nm

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-nm.br_real $@
+exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-nm $@

toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-objdump

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-objdump.br_real $@
+exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-objdump $@

toolchains/tool_wrappers/x86-64-core-i7/2020.08-1/x86-64-core-i7-linux-gnu-2020.08-1-strip

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-strip.br_real $@
+exec external/x86-64-core-i7-linux-gnu-2020.08-1/bin/x86_64-buildroot-linux-gnu-strip $@

toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ar

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-ar.br_real $@
+exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-ar $@

toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-gcov

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-gcov.br_real $@
+exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-gcov $@

toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-ld

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-ld.br_real $@
+exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-ld $@

toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-nm

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-nm.br_real $@
+exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-nm $@

toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-objdump

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-objdump.br_real $@
+exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-objdump $@

toolchains/tool_wrappers/x86-64/2021.11-5/x86-64-linux-gnu-2021.11-5-strip

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-strip.br_real $@
+exec external/x86-64-linux-gnu-2021.11-5/bin/x86_64-buildroot-linux-gnu-strip $@

toolchains/toolchains.bzl

@@ -73,6 +73,7 @@ def bootlin_toolchain_defs(architecture, buildroot_version):
         name = "{0}_cc_toolchain".format(toolchain_name),
         toolchain_config = ":{0}_toolchain_config".format(toolchain_name),
         all_files = ":{0}_all_files".format(toolchain_name),
+        ar_files = ":{0}_all_files".format(toolchain_name),
         compiler_files = ":{0}_all_files".format(toolchain_name),
         dwp_files = "@bazel_bootlin//toolchains:empty",
         linker_files = ":{0}_all_files".format(toolchain_name),