From d1bf9ef268f6315e3ac4727904512b7100aa4377 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Oct 2023 22:39:22 +0000 Subject: [PATCH] try adding gcc suffix support 7 --- _build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_build.sh b/_build.sh index d28c256af..8e8b49ee7 100755 --- a/_build.sh +++ b/_build.sh @@ -1045,10 +1045,11 @@ build_single_target() { fi fi + _BINCORE_PREFIX="${_BINUTILS_PREFIX}" _BINCORE_SUFFIX="${_BINUTILS_SUFFIX}" if [ "${_CC}" = 'gcc' ] && [ -n "${_BINUTILS_SUFFIX}" ]; then - _BINUTILS_PREFIX="${_BINUTILS_PREFIX}gcc-" + _BINCORE_PREFIX="${_BINCORE_PREFIX}gcc-" _BINUTILS_SUFFIX='' fi @@ -1112,9 +1113,9 @@ build_single_target() { # or clang-cl). Workaround: create an alias for it: ln -s -f "/usr/bin/clang${_CCSUFFIX}" "$(pwd)/clang" fi - export AR="${_BINUTILS_PREFIX}ar${_BINCORE_SUFFIX}" - export NM="${_BINUTILS_PREFIX}nm${_BINCORE_SUFFIX}" - export RANLIB="${_BINUTILS_PREFIX}ranlib${_BINCORE_SUFFIX}" + export AR="${_BINCORE_PREFIX}ar${_BINCORE_SUFFIX}" + export NM="${_BINCORE_PREFIX}nm${_BINCORE_SUFFIX}" + export RANLIB="${_BINCORE_PREFIX}ranlib${_BINCORE_SUFFIX}" # ar wrapper to normalize created libs if [ "${CW_DEV_CROSSMAKE_REPRO:-}" = '1' ]; then