Absolutise fallback path

Author: illicitonion

tools/upstream_wrapper/src/main.rs

@@ -20,7 +20,11 @@ fn main() {
             }
             Ok(path)
         })
-        .unwrap_or(PathBuf::from(WRAPPED_TOOL_ROOTPATH));
+        .unwrap_or_else(|| {
+            std::env::current_dir()
+                .expect("Failed to get current directory")
+                .join(WRAPPED_TOOL_ROOTPATH)
+        });
 
     if !wrapped_tool_path.exists() {
         panic!(
@@ -39,7 +43,7 @@ fn main() {
 
     let working_directory = std::env::var_os("BUILD_WORKING_DIRECTORY")
         .map(PathBuf::from)
-        .unwrap_or_else(|| std::env::current_dir().expect("Failed to get working directory"));
+        .unwrap_or_else(|| std::env::current_dir().expect("Failed to get build working directory"));
 
     let mut command = Command::new(wrapped_tool_path);
     command