From 20a7d57812b1fa9168d80ec67ff332e92f820c0a Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 24 Jan 2017 22:04:10 +0100
Subject: [PATCH] Reduce CFLAGS/CXXFLAGS setting
---
gitlab/functions.sh | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 71886b1..39a7bc1 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}
--
GitLab