summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-02-12 21:23:12 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-02-12 21:23:12 +0200
commit904230e7850813bbbb07efe10b980077ce3c0316 (patch)
treeb93904c109dd9bf4e62b95298ab84e65f765a3e0
parentc4892fb386d2624a74fdf5028a91e3c64b103190 (diff)
downloadmeson-winpathfix.tar.gz
Use absolute path if relative can not be evaluated. Closes #2784.winpathfix
-rw-r--r--mesonbuild/interpreter.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 31d7616c2..b838f2859 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1684,7 +1684,14 @@ external dependencies (including libraries) must go to "dependencies".''')
raise InterpreterException('Program or command {!r} not found '
'or not executable'.format(cmd))
cmd = prog
- cmd_path = os.path.relpath(cmd.get_path(), start=srcdir)
+ try:
+ cmd_path = os.path.relpath(cmd.get_path(), start=srcdir)
+ except ValueError:
+ # On Windows a relative path can't be evaluated for
+ # paths on two different drives (i.e. c:\foo and f:\bar).
+ # The only thing left to is is to use the original absolute
+ # path.
+ cmd_path = cmd.get_path()
if not cmd_path.startswith('..') and cmd_path not in self.build_def_files:
self.build_def_files.append(cmd_path)
expanded_args = []