Another attempt to fix windows workflow

Author: andyquinterom

src/Makevars.in

@@ -11,10 +11,12 @@ all: $(SHLIB) rust_clean
 
 $(SHLIB): $(STATLIB)
 
+# SHORT_BASE is set dynamically by tools/config.R
+SHORT_BASE = @SHORT_BASE@
 # CARGO_HOME is set dynamically by tools/config.R
 # On Unix, this uses the current directory (no path length issues)
 CARGOTMP = @CARGO_HOME@
-VENDOR_DIR = $(CURDIR)/vendor
+VENDOR_DIR = $(SHORT_BASE)/vendor
 
 
 # RUSTFLAGS appends --print=native-static-libs to ensure that
@@ -27,7 +29,7 @@ VENDOR_DIR = $(CURDIR)/vendor
 $(STATLIB):
 
 	if [ -f ./rust/vendor.tar.xz ]; then \
-		tar xf rust/vendor.tar.xz && \
+		tar xf rust/vendor.tar.xz -C $(SHORT_BASE) && \
 		mkdir -p $(CARGOTMP) && \
 		cp rust/vendor-config.toml $(CARGOTMP)/config.toml; \
 	fi

src/Makevars.win.in

@@ -13,12 +13,14 @@ all: $(SHLIB) rust_clean
 
 $(SHLIB): $(STATLIB)
 
+# SHORT_BASE is set dynamically by tools/config.R
+SHORT_BASE = @SHORT_BASE@
 # CARGO_HOME is set dynamically by tools/config.R
 # On Windows, this uses the same short base path as TARGET_DIR
 # so that relative paths in aws-lc-sys CMake builds resolve correctly
 CARGOTMP = @CARGO_HOME@
-# Vendor dir is relative to CARGO_HOME's config.toml location
-VENDOR_DIR = $(CARGOTMP)/vendor
+# Vendor dir is relative to SHORT_BASE
+VENDOR_DIR = $(SHORT_BASE)/vendor
 
 $(STATLIB):
 	# Clean any previous build artifacts to avoid conflicts
@@ -28,7 +30,7 @@ $(STATLIB):
 
 	if [ -f ./rust/vendor.tar.xz ]; then \
 		mkdir -p $(CARGOTMP) && \
-		tar xf rust/vendor.tar.xz -C $(CARGOTMP) && \
+		tar xf rust/vendor.tar.xz -C $(SHORT_BASE) && \
 		cp rust/vendor-config.toml $(CARGOTMP)/config.toml; \
 	fi
 

tools/config.R

@@ -36,10 +36,12 @@ if (is_windows) {
   }
 
   # Normalize to forward slashes for Make compatibility
+  .short_base <- short_base
   .target_dir <- paste0(short_base, "/target")
   .cargo_home <- paste0(short_base, "/.cargo")
   message("Using short build path: ", short_base)
 } else {
+  .short_base <- "$(CURDIR)"
   .target_dir <- "./rust/target"
   .cargo_home <- "$(CURDIR)/.cargo"
 }
@@ -143,7 +145,8 @@ new_txt <- gsub("@CRAN_FLAGS@", .cran_flags, mv_txt) |>
   gsub("@TARGET@", .target, x = _) |>
   gsub("@PANIC_EXPORTS@", .panic_exports, x = _) |>
   gsub("@TARGET_DIR@", .target_dir, x = _) |>
-  gsub("@CARGO_HOME@", .cargo_home, x = _)
+  gsub("@CARGO_HOME@", .cargo_home, x = _) |>
+  gsub("@SHORT_BASE@", .short_base, x = _)
 
 message("Writing `", mv_ofp, "`.")
 con <- file(mv_ofp, open = "wb")