aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--mesonbuild/build.py2
-rw-r--r--mesonbuild/compilers.py5
3 files changed, 8 insertions, 1 deletions
diff --git a/README.md b/README.md
index 5e0eae7..95915b0 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ build system.
####Dependencies
- [Python](http://python.org) (version 3.4 or newer)
- - [Ninja](http://martine.github.com/ninja/)
+ - [Ninja](https://ninja-build.org)
####Installing from source
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index 73db5c8..94b95c2 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -879,6 +879,8 @@ class SharedLibrary(BuildTarget):
self.vs_module_defs = File.from_absolute_file(path)
else:
self.vs_module_defs = File.from_source_file(environment.source_dir, self.subdir, path)
+ # link_depends can be an absolute path or relative to self.subdir
+ self.link_depends.append(path)
def check_unknown_kwargs(self, kwargs):
self.check_unknown_kwargs_int(kwargs, known_shlib_kwargs)
diff --git a/mesonbuild/compilers.py b/mesonbuild/compilers.py
index a68a0f9..64a1410 100644
--- a/mesonbuild/compilers.py
+++ b/mesonbuild/compilers.py
@@ -2120,6 +2120,11 @@ class GnuCPPCompiler(CPPCompiler):
return gnu_color_args[colortype][:]
return []
+ def get_pic_args(self):
+ if self.gcc_type == GCC_MINGW:
+ return [] # On Window gcc defaults to fpic being always on.
+ return ['-fPIC']
+
def get_always_args(self):
return ['-pipe']