From a1cf1cdc674261677f9832cc6225881ecebba164 Mon Sep 17 00:00:00 2001 From: Xilokar Date: Tue, 22 Mar 2022 09:59:25 +0100 Subject: [PATCH] gen_makefile.py: fix non absolute path Renamming the make_to_src_proj variable to src_proj in commit 93bd52300ea154d59ad774f749bfd17247d12a51 leads to the build_to_src variable being the result of a double call to os.path.relpath(), breaking builds when using non absolute path for make_dir Change-Id: I2dfc26da94434558b202475af636ce336349bba9 --- gen_makefile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gen_makefile.py b/gen_makefile.py index 6527371..abf3288 100755 --- a/gen_makefile.py +++ b/gen_makefile.py @@ -186,10 +186,10 @@ def gen_make(proj, deps, configure_opts, jobs, make_dir, src_dir, build_dir, url src_proj = os.path.join(src_proj, 'openbsc') build_proj = os.path.join(build_dir, proj) - src = os.path.relpath(src_dir, make_dir) - src_proj = os.path.relpath(src_proj, make_dir) make_to_build_proj = os.path.relpath(build_proj, make_dir) build_to_src = os.path.relpath(src_proj, build_proj) + src = os.path.relpath(src_dir, make_dir) + src_proj = os.path.relpath(src_proj, make_dir) push_url = push_url or url if configure_opts: