From 6aeaea71f79b3b014a91d3994e570b7a15d8e860 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Jul 2020 16:48:46 +0100 Subject: [PATCH] nailing-cargo: Make oot_absdir available earlier No functional change. Signed-off-by: Ian Jackson --- nailing-cargo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nailing-cargo b/nailing-cargo index e9436f0..cef0808 100755 --- a/nailing-cargo +++ b/nailing-cargo @@ -273,6 +273,7 @@ sub consider_alt_cargo_lock () { } our $oot_dir; # oot.dir or "Build" +our $oot_absdir; sub consider_oot () { $oot_dir = cfgs qw(oot dir); @@ -286,6 +287,7 @@ sub consider_oot () { return; } $oot_dir //= 'Build'; + $oot_absdir = ($oot_dir !~ m{^/} ? "$worksphere/" : ""). $oot_dir; } our %manifests; @@ -489,7 +491,6 @@ sub addargs () { unshift @ARGV, @args_preface; } -our $oot_absdir; our $build_absdir; # .../Build/ sub oot_massage_cmdline () { @@ -497,7 +498,6 @@ sub oot_massage_cmdline () { my $use = cfgs qw(oot use); $use // die "$self: out-of-tree build, but \`oot.use' not configured\n"; - $oot_absdir = ($oot_dir !~ m{^/} ? "$worksphere/" : ""). $oot_dir; $build_absdir = "$oot_absdir/$subdir"; my ($pre,$post); -- 2.30.2