Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bootstrap Base precompile in cross compile configuration #53671

Merged
merged 1 commit into from
Mar 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.
  • Loading branch information
Keno committed Mar 9, 2024
commit 892ad7889576e046f796bafba441dbf90ae97d6b
4 changes: 2 additions & 2 deletions pkgimage.mk
Original file line number Diff line number Diff line change
@@ -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 :=