Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

A few win fixes.

This commit is contained in:
Jussi Pakkanen 2016-02-17 23:22:25 +02:00
parent aaf6075c89
commit 25e39f7fb1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mesonbuild/backend/ninjabackend.py
View File

@ -1725,8 +1725,10 @@ rule FORTRAN_DEP_HACK
pass
try:
os.symlink(basename, aliasfile)
except NotImplementedError:
mlog.debug("Library versioning disabled because symlinks are not supported.")
except OSError:
mlog.debug("Library versioning disabled because we do not have symlink creation privileges")
mlog.debug("Library versioning disabled because we do not have symlink creation privileges.")
def generate_gcov_clean(self, outfile):
gcno_elem = NinjaBuildElement(self.all_outputs, 'clean-gcno', 'CUSTOM_COMMAND', 'PHONY')

6
mesonbuild/coredata.py
View File

@ -61,8 +61,10 @@ class UserStringOption(UserOption):
def validate(self, value):
if not isinstance(value, str):
raise MesonException('Value "%s" for string option "%s" is not a string.' % (str(newvalue), self.name))
if self.name == 'prefix' and not os.path.isabs(value):
raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value))
if self.name == 'prefix':
if not os.path.isabs(value):
if len(value) >= 2 and value[1] != ':':
raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value))
if self.name in ('libdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir') \
and os.path.isabs(value):
raise MesonException('Option %s must not be an absolute path.' % self.name)