diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-05-07 22:20:54 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-12 18:56:43 +0300 |
| commit | e99cfdfbc73ae4dd6dfd37fc674088aac01ec63e (patch) | |
| tree | 404e4dacb21caa8ef7d871ecf771a6c088b87da6 /mesonbuild/backend/ninjabackend.py | |
| parent | 1e14438a380c4c9591f94001d5389caf4c323004 (diff) | |
| download | meson-e99cfdfbc73ae4dd6dfd37fc674088aac01ec63e.zip meson-e99cfdfbc73ae4dd6dfd37fc674088aac01ec63e.tar.gz meson-e99cfdfbc73ae4dd6dfd37fc674088aac01ec63e.tar.bz2 | |
Make vs_module_defs: do something for gcc on Windows as well
Module definition files may be useful when building with gcc on Windows also
(e.g. if the existing build uses them, if exports are aliased, if we were
retro enough to export by ordinal, etc.)
Add the .def file to the link command line when using gcc on Windows
Run the appropriate windows tests irrespective of compiler.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 797fb64..b85b11a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2179,10 +2179,10 @@ rule FORTRAN_DEP_HACK commands += linker.get_soname_args(target.prefix, target.name, target.suffix, abspath, target.soversion, isinstance(target, build.SharedModule)) - # This is only visited when using the Visual Studio toolchain + # This is only visited when building for Windows using either GCC or Visual Studio if target.vs_module_defs and hasattr(linker, 'gen_vs_module_defs_args'): commands += linker.gen_vs_module_defs_args(target.vs_module_defs.rel_to_builddir(self.build_to_src)) - # This is only visited when building for Windows using either MinGW/GCC or Visual Studio + # This is only visited when building for Windows using either GCC or Visual Studio if target.import_filename: commands += linker.gen_import_library_args(os.path.join(target.subdir, target.import_filename)) elif isinstance(target, build.StaticLibrary): |