From ab9cda1497e7bed41b474a0ab8a2a4b0547dd916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 14 Dec 2017 17:59:18 +0100 Subject: openmp: Don't try to link GCC's implementation on Clang Also disable openmp build on Travis, breaks on Trusty's Clang. Group deps more naturally. --- platform/x11/detect.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'platform') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 0f07e22e6b..ed75e5eab5 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -265,9 +265,10 @@ def configure(env): env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu']) - if (env["openmp"]): + if env["openmp"]: env.Append(CPPFLAGS=['-fopenmp']) - env.Append(LIBS=['gomp']) + if not env['use_llvm']: + env.Append(LIBS=['gomp']) if env['use_static_cpp']: env.Append(LINKFLAGS=['-static-libstdc++']) -- cgit v1.2.3