diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 71886b1b5232d782fa9697d2f4736e391f96920f..39a7bc186bf9fbc69376fde9045914810f5c5095 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -267,15 +267,13 @@ if [ -z "{PREFIX}" ]; then
   fi
 fi
 
-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"
-  else
-    CFLAGS="${CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0 -pthread"
-  fi
+# Temporary hack to get building done right with conda
+if [ -z "${CFLAGS}" ]; then
+  CFLAGS="-pthread"
 else
-  CFLAGS=""
+  if [[ "${CFLAGS}" != *-pthread* ]]; then
+    CFLAGS="${CFLAGS} -pthread"
+  fi
 fi
 CXXFLAGS=${CFLAGS}