Skip to content

Commit 8fa517f

Browse files
explomanZac He
andauthored
fix lj_vm.obj and do_file (#311)
Co-authored-by: Zac He <zac.he@zoom.us>
1 parent 229831c commit 8fa517f

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

compile/luajit/make.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ lm:executable("luajit/lua") {
145145
"lj_*.c",
146146
"lib_*.c",
147147
"!lj_str_hash.c",
148-
"../../../../" .. lm.bindir .. "/lj_vm.obj",
148+
lm.bindir .. "/lj_vm.obj",
149149
},
150150
includes = {
151151
".",

extension/script/debugger.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
local selfsource = ...
2+
3+
if not selfsource then
4+
local source = debug.getinfo(1, "S").source
5+
if source:sub(1, 1) == "@" then
6+
local filepath = source:sub(2)
7+
selfsource = filepath
8+
end
9+
end
10+
211
local root = selfsource
312
:match "(.+)[/][^/]+$"
413
:match "(.+)[/][^/]+$"

0 commit comments

Comments
 (0)