diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-14 19:05:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-14 19:05:06 +0100 |
| commit | e1b374d5b624c1e0a09d8c6e5c11fc53f8d90423 (patch) | |
| tree | 8e3515be7ebefa45e2ea314a882be61c3bc573d8 | |
| parent | b872439eefb7d54a572ace3a57fea01787c46952 (diff) | |
| parent | ab9cda1497e7bed41b474a0ab8a2a4b0547dd916 (diff) | |
Merge pull request #14662 from akien-mga/openmp-clang
openmp: Don't try to link GCC's implementation on Clang
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | platform/x11/detect.py | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index c11a21aeef..0dfeaf16e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,14 +48,14 @@ addons: - pkg-config - libx11-dev - libxcursor-dev - - libasound2-dev - - libfreetype6-dev + - libxi-dev + - libxinerama-dev + - libxrandr-dev - libgl1-mesa-dev - libglu1-mesa-dev + - libasound2-dev + - libfreetype6-dev - libssl-dev - - libxinerama-dev - - libxrandr-dev - - libxi-dev # For cross-compiling to Windows. #- binutils-mingw-w64-i686 @@ -90,5 +90,5 @@ script: - if [ "$STATIC_CHECKS" = "yes" ]; then sh ./misc/travis/clang-format.sh; else - scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no; + scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no openmp=no; fi 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++']) |