mirror of https://gerrit.osmocom.org/osmo-dev
gen_makefile.py: fix non absolute path
Renamming the make_to_src_proj variable to src_proj in commit
93bd52300e
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
changes/60/27560/1
parent
1b68dbc826
commit
a1cf1cdc67
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue