diff --git a/3party/osrm/osrm-backend/CMakeLists.txt b/3party/osrm/osrm-backend/CMakeLists.txt index 693c088ca3..b8cd78b13d 100755 --- a/3party/osrm/osrm-backend/CMakeLists.txt +++ b/3party/osrm/osrm-backend/CMakeLists.txt @@ -149,8 +149,9 @@ if(CMAKE_BUILD_TYPE MATCHES Release) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.9.0" AND NOT MINGW) message(STATUS "Using gcc specific binutils for LTO.") - set(CMAKE_AR "/usr/bin/gcc-ar") - set(CMAKE_RANLIB "/usr/bin/gcc-ranlib") + get_filename_component(GCC_PATH "${CMAKE_CXX_COMPILER}" PATH) + set(CMAKE_AR "${GCC_PATH}/gcc-ar") + set(CMAKE_RANLIB "${GCC_PATH}/gcc-ranlib") endif() endif() endif() diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh index 04e2695935..65178a8f92 100755 --- a/tools/unix/build_omim.sh +++ b/tools/unix/build_omim.sh @@ -112,14 +112,7 @@ build_conf_osrm() ( export BOOST_INCLUDEDIR="$BOOST_PATH/include" cd "$DIRNAME" - if [ -n "$DEVTOOLSET_PATH" ]; then - # linux-clang spec requires --gcc-toolchain flag - "$QMAKE" "$OMIM_PATH/omim.pro" -spec $OSPEC "CONFIG+=$CONF osrm no-tests" \ - "QMAKE_CXXFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr" \ - "QMAKE_LFLAGS *=--gcc-toolchain=$DEVTOOLSET_PATH/root/usr" - else - "$QMAKE" "$OMIM_PATH/omim.pro" -spec $OSPEC "CONFIG+=$CONF osrm" - fi + "$QMAKE" "$OMIM_PATH/omim.pro" ${SPEC:+-spec $SPEC} "CONFIG+=$CONF osrm" ${CONFIG+"CONFIG*=$CONFIG"} make -j $PROCESSES ) }