diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-06-07 22:24:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-07 22:24:40 +0300 |
| commit | 508a0d60737792d83a6269acea52ed0ccdf8fde2 (patch) | |
| tree | 1393dbb7b392c874e64d3d3e99d24e5dc310204f /mesonbuild/compilers | |
| parent | 86df85d511c8a6c92da248372b47522d0a7e1aec (diff) | |
| parent | 6db9630cf11d036222b39bdde47c3868e529ab3f (diff) | |
| download | meson-508a0d60737792d83a6269acea52ed0ccdf8fde2.zip meson-508a0d60737792d83a6269acea52ed0ccdf8fde2.tar.gz meson-508a0d60737792d83a6269acea52ed0ccdf8fde2.tar.bz2 | |
Merge pull request #7256 from peterh/openmp
Fix OpenMP on Visual Studio
Diffstat (limited to 'mesonbuild/compilers')
| -rw-r--r-- | mesonbuild/compilers/compilers.py | 3 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/visualstudio.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index b0fa5f5..3d75811 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -1087,6 +1087,9 @@ class Compiler: def openmp_flags(self): raise EnvironmentException('Language %s does not support OpenMP flags.' % self.get_display_language()) + def openmp_link_flags(self): + return self.openmp_flags() + def language_stdlib_only_link_flags(self): return [] diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py index d0004ce..4dfd8b4 100644 --- a/mesonbuild/compilers/mixins/visualstudio.py +++ b/mesonbuild/compilers/mixins/visualstudio.py @@ -208,6 +208,9 @@ class VisualStudioLikeCompiler(metaclass=abc.ABCMeta): def openmp_flags(self) -> T.List[str]: return ['/openmp'] + def openmp_link_flags(self) -> T.List[str]: + return [] + # FIXME, no idea what these should be. def thread_flags(self, env: 'Environment') -> T.List[str]: return [] |