Commit 3269028c authored by Markus Frosch's avatar Markus Frosch 😱

rpm: Improve devtoolset detection for cmake

This failed when SCLs were present, but no devtoolset-*
parent 029f30c6
Pipeline #3567 passed with stage
in 18 seconds
...@@ -157,13 +157,14 @@ preconfigure_ccache() { ...@@ -157,13 +157,14 @@ preconfigure_ccache() {
devtoolsets='' devtoolsets=''
if [ -d /opt/rh ]; then if [ -d /opt/rh ]; then
devtoolsets="$(cd /opt/rh && ls -d devtoolset-*)" if devtoolsets="$(cd /opt/rh && ls -d devtoolset-*)"; then
for devtoolset in $devtoolsets; do for devtoolset in $devtoolsets; do
patch_scl_ccache "$devtoolset" "${CCACHE_LINKS}" patch_scl_ccache "$devtoolset" "${CCACHE_LINKS}"
IFS=" " read -r -a extra_compilers <<< "$(find_compilers "/opt/rh/${devtoolset}/root/usr/bin")" IFS=" " read -r -a extra_compilers <<< "$(find_compilers "/opt/rh/${devtoolset}/root/usr/bin")"
compilers+=("${extra_compilers[@]}") compilers+=("${extra_compilers[@]}")
done done
fi
fi fi
echo 'Preparing/Repairing ccache symlinks...' echo 'Preparing/Repairing ccache symlinks...'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment