diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 233551b35c3..e36697fb5cc 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -57,8 +57,10 @@ _EOF cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin" - cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \ - -e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g') + # Override flags: https://gitlab.kitware.com/cmake/cmake/issues/19590 + CFLAGS="${CFLAGS/ -pipe / }" CXXFLAGS="${CXXFLAGS/ -pipe / }" \ + cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \ + -e 's|[^/]$|/|' -e 's|[^/]*||g' -e 's|/|../|g') # Replace -isystem with -I for Qt4 and Qt5 packages find -name flags.make -exec sed -i "{}" -e"s;-isystem;-I;g" \;