diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 292f160..7b64a27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ defaults: env: SCONS_CACHE: ${{ github.workspace }}/.scons-cache - SCONS_VERSION: 4.9.1 + SCONS_VERSION: 4.10.1 jobs: build_linux: @@ -98,7 +98,7 @@ jobs: ${{ matrix.platform }}-${{ matrix.arch }}-${{ matrix.target }}-${{ matrix.lua-runtime }}- - name: Build artifact run: | - scons platform=${{ matrix.platform }} arch=${{ matrix.arch }} target=${{ matrix.target }} lua_runtime=${{ matrix.lua-runtime }} vcvarsall_path="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" + scons platform=${{ matrix.platform }} arch=${{ matrix.arch }} target=${{ matrix.target }} lua_runtime=${{ matrix.lua-runtime }} vcvarsall_path="C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" - name: Upload artifact uses: actions/upload-artifact@v4 with: diff --git a/tools/luajit.py b/tools/luajit.py index 6b81fe3..046f558 100644 --- a/tools/luajit.py +++ b/tools/luajit.py @@ -75,13 +75,13 @@ def generate(env): if env["vcvarsall_path"] and env["arch"] == "arm64" and platform.machine().lower() == "amd64" else "" ), - f"cd {build_dir}/luajit/src", f"msvcbuild.bat {"debug" if env.get("debug_crt") else ""} amalg mixed", ] libluajit = env.Command( f"{build_dir}/luajit/src/lua51.lib", "lib", action=" && ".join(cmd for cmd in cmds if cmd), + chdir=f"{build_dir}/luajit/src", ) # macOS universal special case: build x86_64 and arm64 separately, then `lipo` them together elif env["platform"] == "macos" and env["arch"] == "universal":