diff options
author | ClausKlein <claus.klein@arcormail.de> | 2020-03-17 18:59:28 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-19 19:11:10 +0200 |
commit | 00104b1081cd5076451d83524f4f9bfa75750cf6 (patch) | |
tree | 170a740996115895ee61735aa65943af54bf4e7d | |
parent | f72c990bfd7416931508afd85a7b96d6049bada2 (diff) | |
download | meson-00104b1081cd5076451d83524f4f9bfa75750cf6.zip meson-00104b1081cd5076451d83524f4f9bfa75750cf6.tar.gz meson-00104b1081cd5076451d83524f4f9bfa75750cf6.tar.bz2 |
Remove my notes from sources
changes acording review comments
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 3 | ||||
-rw-r--r-- | mesonbuild/mesonlib.py | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 68af1af..13b7bc6 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2013,7 +2013,6 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) # own target build dir. if not isinstance(i, (build.CustomTarget, build.CustomTargetIndex)): continue - # NOTE: if we want to use os.path.realpath() for include path only! CK idir = os.path.normpath(self.get_target_dir(i)) if not idir: idir = '.' @@ -2028,11 +2027,9 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) def generate_inc_dir(self, compiler, d, basedir, is_system): # Avoid superfluous '/.' at the end of paths when d is '.' if d not in ('', '.'): - # NOTE: if we want to use os.path.realpath() for include path only! CK expdir = os.path.normpath(os.path.join(basedir, d)) else: expdir = basedir - # NOTE: if we want to use os.path.realpath() for include path only! CK srctreedir = os.path.normpath(os.path.join(self.build_to_src, expdir)) sargs = compiler.get_include_args(srctreedir, is_system) # There may be include dirs where a build directory has not been diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index b3f1629..e215dcd 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -270,10 +270,8 @@ 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: |