Skip to content

Commit ef53f5d

Browse files
committed
Remove JANET_LIBPATH
1 parent 6bc6444 commit ef53f5d

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

man/janet-pm.1

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,6 @@ Where to get the "curl" command when handling project.janet. Defaults to "curl".
128128
Where to get the "git" command when handling project.janet. Defaults to "git".
129129
.RE
130130

131-
.B JANET_LIBPATH
132-
.RS
133-
The directory that the MSVC toolchain will use to find janet.h, janet.dll, and libjanet.lib. Most installs should not need to set this, unless
134-
there is a non-standard windows install or possibly multiple Janet versions installed.
135-
.RE
136-
137131
.B JANET_OFFLINE
138132
.RS
139133
If set to 1, true, on, etc., will only look at packages in the local cache.

spork/cc.janet

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
(setdyn *janet-prefix* result)
8686
result)
8787

88-
(defn get-windows-prefix
88+
(defn get-msvc-prefix
8989
"Auto-detect install location on windows systems with a default install. This is the directory containing Library, C, docs, bin, etc."
9090
[]
9191
(if-let [p (dyn *janet-prefix*)] (break p))
@@ -139,8 +139,7 @@
139139
"Guess a library and header path for msvc with a defualt Janet windows install."
140140
[]
141141
(when-let [p (dyn *msvc-cpath*)] (break p))
142-
(when-let [p (os/getenv "JANET_LIBPATH")] (break p)) # TODO - remove?
143-
(def wp (get-windows-prefix))
142+
(def wp (get-msvc-prefix))
144143
(path/join wp "C"))
145144

146145
(defn msvc-janet-import-lib

spork/declare-cc.janet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ int main(int argc, const char **argv) {
769769
(def other-cflags @[])
770770
(if (= toolchain :msvc)
771771
(do
772-
(def libpath (os/getenv "JANET_LIBPATH" ""))
772+
(def libpath (path/join (cc/get-msvc-prefix) "C"))
773773
(def msvc-libjanet (path/join libpath "libjanet.lib"))
774774
(def janeth (path/join libpath "janet.h"))
775775
(assert (= (os/stat janeth :mode) :file) "janet.h not found in expected location, possible misconfiguration")

spork/pm-config.janet

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
(set1 env :gitpath "JANET_GIT")
7171
(set1 env :curlpath "JANET_CURL")
7272
(set1 env :tarpath "JANET_TAR")
73-
(set1 env :msvc-cpath "JANET_LIBPATH")
7473
(set1 env :build-type "JANET_BUILD_TYPE" build-type-xform)
7574
(set1 env :toolchain "JANET_TOOLCHAIN" toochain-xform)
7675
(set1 env :build-root "JANET_BUILD_DIR")

0 commit comments

Comments
 (0)