Skip to content

Commit 892ad78

Browse files
committed
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.
1 parent bb35dc9 commit 892ad78

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pkgimage.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ include $(JULIAHOME)/stdlib/stdlib.mk
66

77

88
# set some influential environment variables
9-
export JULIA_DEPOT_PATH := $(build_prefix)/share/julia
10-
export JULIA_LOAD_PATH := @stdlib:$(JULIAHOME)/stdlib
9+
export JULIA_DEPOT_PATH := $(shell echo $(call cygpath_w,$(build_prefix)/share/julia))
10+
export JULIA_LOAD_PATH := @stdlib$(PATHSEP)$(shell echo $(call cygpath_w,$(JULIAHOME)/stdlib))
1111
unexport JULIA_PROJECT :=
1212
unexport JULIA_BINDIR :=
1313

0 commit comments

Comments
 (0)