diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-10 14:42:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-10 14:42:53 +0200 |
| commit | cbefb57ffe6645cfc469b1a20894bdb7b553f336 (patch) | |
| tree | 0b7d79986e641055e7560903c8322faeb7e01cf9 /mesonbuild/backend | |
| parent | 5ff9e05c8bf05304b80a1c21cbbc11f4d5269ff0 (diff) | |
| parent | 5a1d294b5e27cd77b1ca4ae5d403abd005e20ea9 (diff) | |
| download | meson-cbefb57ffe6645cfc469b1a20894bdb7b553f336.zip meson-cbefb57ffe6645cfc469b1a20894bdb7b553f336.tar.gz meson-cbefb57ffe6645cfc469b1a20894bdb7b553f336.tar.bz2 | |
Merge pull request #2745 from dcbaker/submit/haiku
small fixes for haiku
Diffstat (limited to 'mesonbuild/backend')
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index f7b56bd..3f1e4ce 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -511,7 +511,7 @@ class Backend: # For 'automagic' deps: Boost and GTest. Also dependency('threads'). # pkg-config puts the thread flags itself via `Cflags:` if dep.need_threads(): - commands += compiler.thread_flags() + commands += compiler.thread_flags(self.environment) # Fortran requires extra include directives. if compiler.language == 'fortran': for lt in target.link_targets: diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index e35a391..1057892 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2438,7 +2438,7 @@ rule FORTRAN_DEP_HACK # pkg-config puts the thread flags itself via `Cflags:` for d in target.external_deps: if d.need_threads(): - commands += linker.thread_link_flags() + commands += linker.thread_link_flags(self.environment) # Only non-static built targets need link args and link dependencies if not isinstance(target, build.StaticLibrary): commands += target.link_args |