diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-22 23:40:52 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-24 20:56:06 +0200 |
commit | 8361da5c52e880225df50d209318ef2184c2dbb9 (patch) | |
tree | d6561a9ef4edd9a76f54a23773156a9d1ac7c70c /mesonbuild/build.py | |
parent | 3037ade41dc0cfc1cb84b0a668784c8d1af46987 (diff) | |
download | meson-8361da5c52e880225df50d209318ef2184c2dbb9.zip meson-8361da5c52e880225df50d209318ef2184c2dbb9.tar.gz meson-8361da5c52e880225df50d209318ef2184c2dbb9.tar.bz2 |
Fix setup so test suite runs with rustc + MSVC. Closes: 5099
Diffstat (limited to 'mesonbuild/build.py')
-rw-r--r-- | mesonbuild/build.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 20f0cdb..e2e558a 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1193,6 +1193,10 @@ You probably should put it in link_with instead.''') m = 'Could not get a dynamic linker for build target {!r}' raise AssertionError(m.format(self.name)) + def get_using_rustc(self): + if len(self.sources) > 0 and self.sources[0].fname.endswith('.rs'): + return True + def get_using_msvc(self): ''' Check if the dynamic linker is MSVC. Used by Executable, StaticLibrary, @@ -1610,7 +1614,12 @@ class SharedLibrary(BuildTarget): suffix = 'dll' self.vs_import_filename = '{0}{1}.lib'.format(self.prefix if self.prefix is not None else '', self.name) self.gcc_import_filename = '{0}{1}.dll.a'.format(self.prefix if self.prefix is not None else 'lib', self.name) - if self.get_using_msvc(): + if self.get_using_rustc(): + # Shared library is of the form foo.dll + prefix = '' + # Import library is called foo.dll.lib + self.import_filename = '{0}.dll.lib'.format(self.name) + elif self.get_using_msvc(): # Shared library is of the form foo.dll prefix = '' # Import library is called foo.lib |