commit d44943c59bec631f2ca1c8cd3d38ffaf04c51fd5
author Olivier Deprez <olivier.deprez@arm.com> Fri Sep 06 09:02:56 2024 +0200
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Fri Sep 06 09:02:56 2024 +0200
tree ff55fa31daea9c2cc6121556e2e7908ad04c5e7c
parent e7a4a220fb56626e0bd5ebcfa05f5d734fce1247
parent 9d5a1c3754f1a1becf194dede42861edea6b7d7c

Merge "build: use `ar` over `gcc-ar`" into integration

make_helpers/toolchain.mk

diff --git a/make_helpers/toolchain.mk b/make_helpers/toolchain.mk
index 96e43a8..9a06a9c 100644
--- a/make_helpers/toolchain.mk
+++ b/make_helpers/toolchain.mk
@@ -289,7 +289,7 @@
         guess-gnu-gcc-ld = $(1)
         guess-gnu-gcc-oc = $(shell $(1) --print-prog-name objcopy 2>$(nul))
         guess-gnu-gcc-od = $(shell $(1) --print-prog-name objdump 2>$(nul))
-        guess-gnu-gcc-ar = $(call which,$(call decompat-path,$(patsubst %$(call file-name,$(1)),%$(subst gcc,gcc-ar,$(call file-name,$(1))),$(call compat-path,$(1)))))
+        guess-gnu-gcc-ar = $(shell $(1) --print-prog-name ar 2>$(nul))
 
         define toolchain-warn-unrecognized
                 $$(warning )