diff options
| author | ClausKlein <claus.klein@arcormail.de> | 2020-03-13 08:44:22 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-19 19:11:10 +0200 |
| commit | f72c990bfd7416931508afd85a7b96d6049bada2 (patch) | |
| tree | ccc80cdb3bad0416d45cb5e45bffe7aa1c8b7ce5 /mesonbuild/mesonlib.py | |
| parent | 12fa8d06e214223157ba281efea4e71dc5d0997e (diff) | |
| download | meson-f72c990bfd7416931508afd85a7b96d6049bada2.zip meson-f72c990bfd7416931508afd85a7b96d6049bada2.tar.gz meson-f72c990bfd7416931508afd85a7b96d6049bada2.tar.bz2 | |
Use os.path.normpath() for include paths
This make relative pathes shorter an too give a chance to
de-duplicate -isystem flags just like -I flags.
Fix common test case 203 for OSX build host too
Diffstat (limited to 'mesonbuild/mesonlib.py')
| -rw-r--r-- | mesonbuild/mesonlib.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index e215dcd..b3f1629 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -270,8 +270,10 @@ class File: def rel_to_builddir(self, build_to_src: str) -> str: if self.is_built: return self.relative_name() + #NO! return os.path.realpath(self.relative_name()) else: return os.path.join(build_to_src, self.subdir, self.fname) + #NO! return os.path.realpath(os.path.join(build_to_src, self.subdir, self.fname)) @lru_cache(maxsize=None) def absolute_path(self, srcdir: str, builddir: str) -> str: |