Skip to content

Commit

Permalink
Fix bootstrap Base precompile in cross compile configuration
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Keno committed Mar 9, 2024
1 parent bb35dc9 commit 892ad78
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkgimage.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 :=

Expand Down

0 comments on commit 892ad78

Please sign in to comment.