Changes to use compile with CLang 10

This commit is contained in:
bernat 2021-11-24 12:01:35 +01:00
parent 8b8f703b43
commit df05a509f3
3 changed files with 8 additions and 8 deletions

View File

@ -89,8 +89,8 @@ if ${BUILD_OSM2ODR} ; then
mkdir -p ${OSM2ODR_BUILD_FOLDER}
cd ${OSM2ODR_BUILD_FOLDER}
# define clang compiler
export CC=/usr/bin/clang-8
export CXX=/usr/bin/clang++-8
export CC=/usr/bin/clang-10
export CXX=/usr/bin/clang++-10
cmake ${OSM2ODR_SOURCE_FOLDER} \
-G "Eclipse CDT4 - Ninja" \

View File

@ -50,8 +50,8 @@ done
source $(dirname "$0")/Environment.sh
export CC=clang-8
export CXX=clang++-8
export CC=clang-10
export CXX=clang++-10
if ! { ${REMOVE_INTERMEDIATE} || ${BUILD_PYTHONAPI} ; }; then
fatal_error "Nothing selected to be done."

View File

@ -37,14 +37,14 @@ done
# -- Set up environment --------------------------------------------------------
# ==============================================================================
command -v /usr/bin/clang++-8 >/dev/null 2>&1 || {
command -v /usr/bin/clang++-10 >/dev/null 2>&1 || {
echo >&2 "clang 8 is required, but it's not installed.";
exit 1;
}
CXX_TAG=c8
export CC=/usr/bin/clang-8
export CXX=/usr/bin/clang++-8
CXX_TAG=c10
export CC=/usr/bin/clang-10
export CXX=/usr/bin/clang++-10
source $(dirname "$0")/Environment.sh