ruki 4 rokov pred
rodič
commit
31462c7f88
2 zmenil súbory, kde vykonal 5 pridanie a 1 odobranie
  1. 1 1
      .github/workflows/cross_musl.yml
  2. 4 0
      scripts/test.lua

+ 1 - 1
.github/workflows/cross_musl.yml

@@ -26,5 +26,5 @@ jobs:
 
       - name: Tests
         run: |
-          xmake l ./scripts/test.lua -D -p cross --sdk=`pwd`/${{ matrix.cross }}-cross
+          xmake l ./scripts/test.lua -D -p cross --toolchain=musl --sdk=`pwd`/${{ matrix.cross }}-cross
 

+ 4 - 0
scripts/test.lua

@@ -20,6 +20,7 @@ local options =
 ,   {nil, "sdk",        "kv", nil, "Set the SDK directory of cross toolchain."  }
 ,   {nil, "vs_sdkver",  "kv", nil, "Set the Windows SDK version."               }
 ,   {nil, "mingw",      "kv", nil, "Set the MingW directory."                   }
+,   {nil, "toolchain",  "kv", nil, "Set the toolchain name."                    }
 ,   {nil, "packages",   "vs", nil, "The package list."                          }
 }
 
@@ -54,6 +55,9 @@ function _require_packages(argv, packages)
     if argv.mingw then
         table.insert(config_argv, "--mingw=" .. argv.mingw)
     end
+    if argv.toolchain then
+        table.insert(config_argv, "--toolchain=" .. argv.toolchain)
+    end
     if argv.cflags then
         table.insert(config_argv, "--cflags=" .. argv.cflags)
     end