From 892ad7889576e046f796bafba441dbf90ae97d6b Mon Sep 17 00:00:00 2001 From: Keno Fischer Date: Sat, 9 Mar 2024 04:57:16 +0000 Subject: [PATCH] Fix bootstrap Base precompile in cross compile configuration The environment variables here need to have target semantics, so on Windows the path separator needs to be `;` and the path needs to be converted to windows before being passed through julia. Because variable assignment is not ordinarily shell expanded, we also need an extra `$(shell)` to perform this conversion. Fixes MSYS2 builds of Julia after #53598. --- pkgimage.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgimage.mk b/pkgimage.mk index 485e27996bb44..740b9760cab48 100644 --- a/pkgimage.mk +++ b/pkgimage.mk @@ -6,8 +6,8 @@ include $(JULIAHOME)/stdlib/stdlib.mk # set some influential environment variables -export JULIA_DEPOT_PATH := $(build_prefix)/share/julia -export JULIA_LOAD_PATH := @stdlib:$(JULIAHOME)/stdlib +export JULIA_DEPOT_PATH := $(shell echo $(call cygpath_w,$(build_prefix)/share/julia)) +export JULIA_LOAD_PATH := @stdlib$(PATHSEP)$(shell echo $(call cygpath_w,$(JULIAHOME)/stdlib)) unexport JULIA_PROJECT := unexport JULIA_BINDIR :=