diff --git a/gitlab/functions.sh b/gitlab/functions.sh index bbcd47c515b3d80f6c16cc382ad23d1c995497fa..d2f2a42893e9e2b1b15d9b7ffca7c30dc8a7d669 100644 --- a/gitlab/functions.sh +++ b/gitlab/functions.sh @@ -216,21 +216,13 @@ PREFIX=${CI_PROJECT_DIR}/${VIRTUALENV_PATH} if [ "${OSNAME}" == "linux" ]; then # Temporary hack to get building done right with gcc-5 compilers if [ -z "${CFLAGS}" ]; then - CFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -pthread" + CFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0" else - if [[ "${CFLAGS}" != *-pthread* ]]; then - CFLAGS="${CFLAGS} -pthread" - fi if [[ "${CFLAGS}" != *-D_GLIBCXX_USE_CXX11_ABI=0* ]]; then CFLAGS="${CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0" fi fi else #macosx - if [ -z "${CFLAGS}" ]; then - CFLAGS="-pthread" - elif [[ "${CFLAGS}" != *-pthread* ]]; then - CFLAGS="${CFLAGS} -pthread" - fi if [ "${CFLAGS}" == *-DBZ_DEBUG* ]; then # -DBZ_DEBUG does not work well with clang CFLAGS=`echo ${CFLAGS} | sed -e s/\s*-DBZ_DEBUG//g`