Skip to content

Commit feec0ec

Browse files
committed
Revert "Set JULIA_PKGDIR before Julia ever starts up when building docs (#25009)"
This reverts commit 38ba1d0.
1 parent 38ba1d0 commit feec0ec

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

doc/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
77
JULIAHOME := $(abspath $(SRCDIR)/..)
88
include $(JULIAHOME)/Make.inc
99
JULIA_EXECUTABLE := $(call spawn,$(build_bindir)/julia)
10-
export JULIA_PKGDIR := $(abspath $(SRCDIR)/deps)
1110

1211
.PHONY: help clean cleanall html pdf linkcheck doctest check deps deploy
1312

doc/make.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
# Install dependencies needed to build the documentation.
2-
if ENV["JULIA_PKGDIR"] != joinpath(@__DIR__, "deps")
3-
# We clobber package repositories here, so don't let the user hurt themselves
4-
error("Must set JULIA_PKGDIR to $(joinpath(@__DIR__, "deps"))")
5-
else
6-
info(ENV["JULIA_PKGDIR"])
7-
end
2+
ENV["JULIA_PKGDIR"] = joinpath(@__DIR__, "deps")
83
Pkg.init()
94
cp(joinpath(@__DIR__, "REQUIRE"), Pkg.dir("REQUIRE"); remove_destination = true)
105
Pkg.update()

0 commit comments

Comments
 (0)