From ee056dfef6e3567d49e82fe4af8604885ef736f5 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Thu, 18 Jun 2020 08:31:50 +0100 Subject: [PATCH] CI: Try shared libraries on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This might make linking a bit less prone to OOM when trying to pull in LLVM. Signed-off-by: Daniel Stone Reviewed-by: Michel Dänzer Reviewed-by: Eric Engestrom Reviewed-by: Eric Anholt Part-of: --- .gitlab-ci/windows/mesa_build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1 index 61b8e4b1022..76cf601f1ee 100644 --- a/.gitlab-ci/windows/mesa_build.ps1 +++ b/.gitlab-ci/windows/mesa_build.ps1 @@ -6,7 +6,7 @@ Get-Date Write-Host "Compiling Mesa" $builddir = New-Item -ItemType Directory -Name "build" Push-Location $builddir.FullName -cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=static --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" --pkg-config-path="C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig" -Dllvm=true -Dshared-llvm=false -Dgallium-drivers=swrast -Dbuild-tests=true && ninja test' +cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson --default-library=shared --buildtype=release -Db_ndebug=false -Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" --pkg-config-path="C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig" -Dllvm=true -Dshared-llvm=false -Dgallium-drivers=swrast -Dbuild-tests=true && ninja test' $buildstatus = $? Pop-Location Remove-Item -Recurse -Path $builddir -- 2.30.2