KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: do not specify c_std and cpp_std for windows-build 

When parts of the tree needs later c and c++ versions, they should ask
for it in the build-system itself, not expect the user to ask for it on
the command-line instead. So let's not paper over things by specifying
them here.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15706>
This commit is contained in:
Erik Faye-Lund 2022-04-01 09:13:36 +02:00 committed by Marge Bot
parent f607db2689
commit c42da6dd60
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/windows/mesa_build.ps1
View File

@ -31,7 +31,7 @@ Enter-VsDevShell -VsInstallPath $installPath -SkipAutomaticLocation -DevCmdArgum
Push-Location $builddir
meson --default-library=shared -Dzlib:default_library=static --buildtype=release -Db_ndebug=false `
-Dc_std=c17 -Dcpp_std=vc++latest -Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" `
-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" `
--prefix="$installdir" `
-Dllvm=enabled -Dshared-llvm=disabled `