chiark / gitweb /
Do not set CARGO_MANIFEST_DIR when linkfarming
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Oct 2020 12:18:20 +0000 (13:18 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Oct 2020 12:18:20 +0000 (13:18 +0100)
That just confuses naive tests etc.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
nailing-cargo

index 068a3f92bd7472b89d4331b3497387fc81aad402..1489f7fb6c1802a3cbb944d481b3c49794d6f806 100755 (executable)
@@ -732,7 +732,7 @@ END
 }
 
 sub setenvs () {
-  $ENV{CARGO_MANIFEST_DIR} = $src_absdir;
+  $ENV{CARGO_MANIFEST_DIR} = $src_absdir unless $linkfarm_depth;
   $ENV{NAILINGCARGO_MANIFEST_DIR} = $src_absdir;
   $ENV{NAILINGCARGO_WORKSPHERE}   = $worksphere;
   $ENV{NAILINGCARGO_BUILDSPHERE}  = $oot_absdir;