Skip to content

Commit 215dca2

Browse files
authored
pkgimage.mk: Avoid using environment variable as Makefile variable. (#57753)
1 parent 4480f42 commit 215dca2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkgimage.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ JULIAHOME := $(SRCDIR)
44
include $(JULIAHOME)/Make.inc
55
include $(JULIAHOME)/stdlib/stdlib.mk
66

7+
DEPOTDIR := $(build_prefix)/share/julia
78

89
# set some influential environment variables
9-
export JULIA_DEPOT_PATH := $(shell echo $(call cygpath_w,$(build_prefix)/share/julia))
10+
export JULIA_DEPOT_PATH := $(shell echo $(call cygpath_w,$(DEPOTDIR)))
1011
export JULIA_LOAD_PATH := @stdlib$(PATHSEP)$(shell echo $(call cygpath_w,$(JULIAHOME)/stdlib))
1112
unexport JULIA_PROJECT :=
1213
unexport JULIA_BINDIR :=
@@ -18,13 +19,13 @@ release: $(BUILDDIR)/stdlib/release.image
1819
debug: $(BUILDDIR)/stdlib/debug.image
1920
all: release debug
2021

21-
$(JULIA_DEPOT_PATH)/compiled:
22+
$(DEPOTDIR)/compiled:
2223
mkdir -p $@
2324

2425
print-depot-path:
2526
@$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --startup-file=no -e '@show Base.DEPOT_PATH')
2627

27-
$(BUILDDIR)/stdlib/%.image: $(JULIAHOME)/stdlib/Project.toml $(JULIAHOME)/stdlib/Manifest.toml $(INDEPENDENT_STDLIBS_SRCS) $(JULIA_DEPOT_PATH)/compiled
28+
$(BUILDDIR)/stdlib/%.image: $(JULIAHOME)/stdlib/Project.toml $(JULIAHOME)/stdlib/Manifest.toml $(INDEPENDENT_STDLIBS_SRCS) $(DEPOTDIR)/compiled
2829
@$(call PRINT_JULIA, JULIA_CPU_TARGET="$(JULIA_CPU_TARGET)" $(call spawn,$(JULIA_EXECUTABLE)) --startup-file=no -e \
2930
'Base.Precompilation.precompilepkgs(configs=[``=>Base.CacheFlags(debug_level=2, opt_level=3), ``=>Base.CacheFlags(check_bounds=1, debug_level=2, opt_level=3)])')
3031
touch $@
@@ -33,5 +34,5 @@ $(BUILDDIR)/stdlib/release.image: $(build_private_libdir)/sys.$(SHLIB_EXT)
3334
$(BUILDDIR)/stdlib/debug.image: $(build_private_libdir)/sys-debug.$(SHLIB_EXT)
3435

3536
clean:
36-
rm -rf $(JULIA_DEPOT_PATH)/compiled
37+
rm -rf $(DEPOTDIR)/compiled
3738
rm -f $(BUILDDIR)/stdlib/*.image

0 commit comments

Comments
 (0)