Sfoglia il codice sorgente

fix lua and luajit

ruki 6 anni fa
parent
commit
45e5c479de
2 ha cambiato i file con 6 aggiunte e 1 eliminazioni
  1. 1 0
      packages/l/lua/xmake.lua
  2. 5 1
      packages/l/luajit/xmake.lua

+ 1 - 0
packages/l/lua/xmake.lua

@@ -16,6 +16,7 @@ package("lua")
         if package:plat() ~= "windows" then
             package:add("syslinks", "dl")
         end
+        package:addenv("PATH", "bin")
     end)
 
     on_install(function (package)

+ 5 - 1
packages/l/luajit/xmake.lua

@@ -17,9 +17,12 @@ package("luajit")
     add_includedirs("include/luajit")
 
     on_load(function (package)
-        if package:plat() ~= "windows" then
+        if package:plat() == "windows" then
+            package:addenv("PATH", "lib")
+        else
             package:add("syslinks", "dl")
         end
+        package:addenv("PATH", "bin")
     end)
 
     on_install("windows", function (package)
@@ -43,6 +46,7 @@ package("luajit")
     end)
 
     on_test(function (package)
+        print(os.getenv("PATH"))
         os.vrun("luajit -e \"print('hello xmake!')\"")
         assert(import("lib.detect.has_cfuncs")("lua_pcall", {configs = package:fetch(), includes = "luajit.h"}))
     end)