mirror of
https://github.com/ceph/ceph
synced 2024-12-28 06:23:08 +00:00
do_cmake:sh: use newer gcc if available
despite that we are using clang in `run-make-check.sh`, `do_cmake.sh`
is still used by some workflows like jenkins' ceph-pr-api job.
now that we've migrated to C++20, we need to use GCC-11 or up for
building the tree. GCC-11 is installed from PPA repo in
`install-deps.sh`, but to avoid interfere with the build of older
branches which do not use GCC-11, as their builds might break if
we use GCC-11 for building them. we don't use the alternative machinary
to point gcc to gcc-11, see 8f342a32ce
.
so, in this change, we try to use the newest GCC in system when
running `do_cmake.sh`.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
This commit is contained in:
parent
ba8a30c663
commit
3d3b94a9dc
13
do_cmake.sh
13
do_cmake.sh
@ -59,6 +59,19 @@ if type ccache > /dev/null 2>&1 ; then
|
||||
ARGS+=" -DWITH_CCACHE=ON"
|
||||
fi
|
||||
|
||||
cxx_compiler="g++"
|
||||
c_compiler="gcc"
|
||||
# 20 is used for more future-proof
|
||||
for i in $(seq 20 -1 11); do
|
||||
if type -t gcc-$i > /dev/null; then
|
||||
cxx_compiler="g++-$i"
|
||||
c_compiler="gcc-$i"
|
||||
break
|
||||
fi
|
||||
done
|
||||
ARGS+=" -DCMAKE_CXX_COMPILER=$cxx_compiler"
|
||||
ARGS+=" -DCMAKE_C_COMPILER=$c_compiler"
|
||||
|
||||
mkdir $BUILD_DIR
|
||||
cd $BUILD_DIR
|
||||
if type cmake3 > /dev/null 2>&1 ; then
|
||||
|
Loading…
Reference in New Issue
Block a user