commit dbf6531eba44afbcb6ab101373fcc495d855bb6a
author Nathan Mulcahey <nmulcahey@google.com> Mon May 15 21:33:20 2023 +0000
committer releases-prod-builder <releases-prod-builder@fuchsia-infra.iam.gserviceaccount.com> Tue May 16 13:17:59 2023 +0000
tree 9342547a00c7d4a1f8dab16f38771037845245c5
parent 54b8e0485049a65998d10a72a6b616fdb4530028

[gn][sdk] Use toolchain readelf

If `fuchsia_sdk_readelf_exec` is unset it defaults to a PATH search
and was using `/usr/bin/readelf` from a host `gcc` install.

Bug: 127321
Change-Id: I7e0cf70aacadd5779358a941dc166a107d1bceb3
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/855839
Commit-Queue: Nathan Mulcahey <nmulcahey@google.com>
Reviewed-by: Marc-Antoine Ruel <maruel@google.com>
(cherry picked from commit 2a1f42dbd081695e846f287f715053784d7e9013)

scripts/sdk/gn/templates/run_py.mako

diff --git a/scripts/sdk/gn/templates/run_py.mako b/scripts/sdk/gn/templates/run_py.mako
index 804742c..7043cee 100755
--- a/scripts/sdk/gn/templates/run_py.mako
+++ b/scripts/sdk/gn/templates/run_py.mako
@@ -127,7 +127,7 @@
         invocation = [
             self.gn, "gen",
             os.path.join(self.out_dir, arch),
-            "--args=target_cpu=\"{cpu}\" target_os=\"fuchsia\" clang_base_path=\"{clang}\" buildidtool=\"{buildidtool}\" {additional_args}"
+            "--args=target_cpu=\"{cpu}\" target_os=\"fuchsia\" clang_base_path=\"{clang}\" buildidtool=\"{buildidtool}\" fuchsia_sdk_readelf_exec=\"{clang}/bin/llvm-readelf\" {additional_args}"
             .format(
                 cpu=arch, clang=self.clang, buildidtool=self.buildidtool, additional_args=additional_args)
         ]