From e69fb7871e87887669690963fb1a266adfd53aa1 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 24 Jan 2017 21:58:08 +0100
Subject: [PATCH] Simplify CFLAGS/CXXFLAGS setup
---
gitlab/functions.sh | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 0d5335c..71886b1 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -270,9 +270,9 @@ 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"
+ CFLAGS="-D_GLIBCXX_USE_CXX11_ABI=0 -pthread"
else
- CFLAGS="${CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0"
+ CFLAGS="${CFLAGS} -D_GLIBCXX_USE_CXX11_ABI=0 -pthread"
fi
else
CFLAGS=""
@@ -310,10 +310,3 @@ if [ -z "${CI_BUILD_TAG}" ]; then
else
log_info "Building tag, not setting BOB_DOCUMENTATION_SERVER"
fi
-
-# Patches conda environment
-log_info "Patching build flags to provide for conda..."
-CFLAGS="${CFLAGS} -pthread"
-export_env CFLAGS
-CXXFLAGS="${CXXFLAGS} -pthread"
-export_env CXXFLAGS
--
GitLab