Skip to content

Commit

Permalink
allow overriding gccsuffix separately
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Oct 10, 2023
1 parent 5b615c7 commit 6f4b200
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions _ci-linux-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [[ "${CW_CONFIG:-}" = *'win'* ]]; then
extra="${extra} nasm"
fi
elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
GCCSUFF='-13'
[ -n "${CW_GCCSUFFIFX:-}" ] || export CW_GCCSUFFIFX='-13'
extra="${extra} checksec"
if [[ "${CW_CONFIG:-}" = *'musl'* ]]; then
extra="${extra} musl musl-dev musl-tools"
Expand All @@ -32,21 +32,21 @@ elif [[ "${CW_CONFIG:-}" = *'linux'* ]]; then
else
if [ "$(uname -m)" = 'aarch64' ]; then
if [[ "${CW_CONFIG:-}" = *'gcc'* ]]; then
extra="${extra} gcc${GCCSUFF}-x86-64-linux-gnu g++${GCCSUFF}-x86-64-linux-gnu"
extra="${extra} gcc${CW_GCCSUFFIX}-x86-64-linux-gnu g++${CW_GCCSUFFIX}-x86-64-linux-gnu"
else
extra="${extra} libgcc${GCCSUFF}-dev-amd64-cross libstdc++${GCCSUFF}-dev-amd64-cross"
extra="${extra} libgcc${CW_GCCSUFFIX}-dev-amd64-cross libstdc++${CW_GCCSUFFIX}-dev-amd64-cross"
fi
else
if [[ "${CW_CONFIG:-}" = *'gcc'* ]]; then
extra="${extra} gcc${GCCSUFF}-aarch64-linux-gnu g++${GCCSUFF}-aarch64-linux-gnu"
extra="${extra} gcc${CW_GCCSUFFIX}-aarch64-linux-gnu g++${CW_GCCSUFFIX}-aarch64-linux-gnu"
else
extra="${extra} libgcc${GCCSUFF}-dev-arm64-cross libstdc++${GCCSUFF}-dev-arm64-cross"
extra="${extra} libgcc${CW_GCCSUFFIX}-dev-arm64-cross libstdc++${CW_GCCSUFFIX}-dev-arm64-cross"
fi
fi
fi
if [[ "${CW_CONFIG:-}" = *'gcc'* ]]; then
extra="${extra} gcc${GCCSUFF} g++${GCCSUFF}"
CW_CCSUFFIX="${GCCSUFF}"
extra="${extra} gcc${CW_GCCSUFFIX} g++${CW_GCCSUFFIX}"
CW_CCSUFFIX="${CW_GCCSUFFIX}"
fi
fi

Expand Down

0 comments on commit 6f4b200

Please sign in to comment.