From d32fa76913d395d79924888289cb066ed931df95 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Wed, 25 Jan 2017 06:44:21 +0100
Subject: [PATCH] Remove any trace of -pthread settings since
bob/bob.extension#34 is now fixed
---
gitlab/functions.sh | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 39a7bc1..5c75d8e 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -267,16 +267,6 @@ if [ -z "{PREFIX}" ]; then
fi
fi
-# Temporary hack to get building done right with conda
-if [ -z "${CFLAGS}" ]; then
- CFLAGS="-pthread"
-else
- if [[ "${CFLAGS}" != *-pthread* ]]; then
- CFLAGS="${CFLAGS} -pthread"
- fi
-fi
-CXXFLAGS=${CFLAGS}
-
if [ -z "${PYPISERVER}" ]; then
PYPISERVER="https://pypi.python.org/pypi"
fi
@@ -287,8 +277,6 @@ check_env OSNAME
check_env PYVER
check_env PREFIX
export_env PREFIX
-export_env CFLAGS
-export_env CXXFLAGS
export_env BOB_PREFIX_PATH
check_env DOCSERVER
check_env PYPISERVER
--
GitLab