From a1159ff0d500626069e75ed8e697f78df1befd4d Mon Sep 17 00:00:00 2001 From: Evan Martin Date: Tue, 17 Nov 2015 14:28:08 -0800 Subject: when building with cwd = source root, use relative paths The pull request that introduced building from a directory other than the source dir, https://github.com/ninja-build/ninja/pull/979, made it so all source paths are effectively absolute paths. This change restores the old behavior in the case when you are building in the source. See the comments there. --- configure.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.py b/configure.py index 845b046..d60cbac 100755 --- a/configure.py +++ b/configure.py @@ -281,7 +281,12 @@ def binary(name): return exe return name -n.variable('root', sourcedir) +root = sourcedir +if root == os.getcwd(): + # In the common case where we're building directly in the source + # tree, simplify all the paths to just be cwd-relative. + root = '.' +n.variable('root', root) n.variable('builddir', 'build') n.variable('cxx', CXX) if platform.is_msvc(): -- cgit v1.2.1