From d4f03f7425b9b8a9d505e4f5787927cbdbe2f307 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Wed, 25 Jan 2017 06:42:53 +0100
Subject: [PATCH] Remove all settings for -pthread since bob/bob.extension#34
is now fixed
---
gitlab/functions.sh | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index bbcd47c..d2f2a42 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`
--
GitLab