Fix Windows again.

pull/262/head
Jussi Pakkanen 10 years ago
parent 2e3bd006d3
commit 4dd6a85075
  1. 3
      compilers.py
  2. 2
      ninjabackend.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')]

@ -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:

Loading…
Cancel
Save