ext-toolchain: fix wrapper for gcc-ar, gcc-nm, gcc-ranlib

The pattern '*-*cc-*' incorrectly matches these tools because their names
contain 'cc-'. This causes them to receive compiler CFLAGS, breaking
builds with 'ar: two different operation options specified'.

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
Link: https://github.com/openwrt/openwrt/pull/21757
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit 435917735ab8a9ba23300dda77aaace13fc16d96)
Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
Link: https://github.com/openwrt/openwrt/pull/21899
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh
index 2794d2e8eff40bb03ad331c7096214c8235fed9e..8b38d17786683225301c7ce0c6a14032b1f49680 100755 (executable)
--- a/scripts/ext-toolchain.sh
+++ b/scripts/ext-toolchain.sh
@@ -282,6 +282,9 @@ wrap_bins() {
                                fi
 
                                case "${cmd##*/}" in
+                                       *-gcc-ar|*-gcc-nm|*-gcc-ranlib)
+                                               wrap_bin_other "$out" "$bin"
+                                       ;;
                                        *-*cc|*-*cc-*|*-*++|*-*++-*|*-cpp)
                                                wrap_bin_cc "$out" "$bin"
                                        ;;