diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-06 16:35:55 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-09-06 16:35:55 +0300 |
| commit | 4dd6a85075703733f1f610df650b82879b911be7 (patch) | |
| tree | 21af6c7b1a1d66a45dcd52606699e305f890209f | |
| parent | 2e3bd006d319aca659cfbd8a31894e641a7a79e6 (diff) | |
| download | meson-4dd6a85075703733f1f610df650b82879b911be7.zip meson-4dd6a85075703733f1f610df650b82879b911be7.tar.gz meson-4dd6a85075703733f1f610df650b82879b911be7.tar.bz2 | |
Fix Windows again.
| -rw-r--r-- | compilers.py | 3 | ||||
| -rw-r--r-- | ninjabackend.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/compilers.py b/compilers.py index f457cf3..95582c9 100644 --- a/compilers.py +++ b/compilers.py @@ -1049,7 +1049,8 @@ def get_gcc_soname_args(gcc_type, shlib_name, path, soversion): sostr = '' else: sostr = '.' + soversion - if gcc_type == GCC_STANDARD: + if gcc_type == GCC_STANDARD or gcc_type == GCC_MINGW: + # Might not be correct for mingw but seems to work. return ['-Wl,-soname,lib%s.so%s' % (shlib_name, sostr)] elif gcc_type == GCC_OSX: return ['-install_name', os.path.join(path, 'lib' + shlib_name + '.dylib')] diff --git a/ninjabackend.py b/ninjabackend.py index be4277d..0bc500d 100644 --- a/ninjabackend.py +++ b/ninjabackend.py @@ -1402,7 +1402,7 @@ rule FORTRAN_DEP_HACK basename = target.get_filename() aliases = target.get_aliaslist() aliascmd = [] - if shutil.which('ln'): + if not mesonlib.is_windows(): for alias in aliases: aliasfile = os.path.join(self.environment.get_build_dir(), outdir, alias) try: |