test

Author: rcitach

repo/packages/s/sdl2/xmake.lua

@@ -76,9 +76,8 @@ do
         table.insert(configs, "--enable-video-rtt-touch=no")
         table.insert(configs, "--enable-video-rtt-fbdev=yes")
 
-        local buildenvs = import("package.tools.autoconf").buildenvs(package)
-        import("package.tools.autoconf").configure(package, configs, {envs = buildenvs})
-        import("package.tools.make").install(package, {}, {envs = buildenvs})
+        import("package.tools.autoconf").configure(package, configs)
+        import("package.tools.make").install(package)
 
     end)
 

tools/scripts/toolchains/riscv64gc-unknown-smart-musl.lua

@@ -34,14 +34,14 @@ do
 
         toolchain:add("cxflags", "-mcmodel=medany", "-march=rv64imafdc", "-mabi=lp64", {force = true})
 
-        -- local link_type = os.getenv("RT_XMAKE_LINK_TYPE") or "shared"
-        -- if link_type == "static" then
-        --     local ldscript = rtflags.get_ldscripts(false)
-        --     toolchain:add("ldflags", ldscript.ldflags, {force = true})
-        -- else
-        --     local ldscript = rtflags.get_ldscripts(true)
-        --     toolchain:add("ldflags", ldscript.ldflags, {force = true})
-        -- end
+        local link_type = os.getenv("RT_XMAKE_LINK_TYPE") or "shared"
+        if link_type == "static" then
+            local ldscript = rtflags.get_ldscripts(false)
+            toolchain:add("ldflags", ldscript.ldflags, {force = true})
+        else
+            local ldscript = rtflags.get_ldscripts(true)
+            toolchain:add("ldflags", ldscript.ldflags, {force = true})
+        end
     end)
 end
 toolchain_end()