Mesa (main): ci: do not specify c_std and cpp_std for windows-build

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c42da6dd607547ab1808fa7478887cbf179ece3e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c42da6dd607547ab1808fa7478887cbf179ece3e

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Fri Apr  1 09:13:36 2022 +0200

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 at collabora.com>
Reviewed-by: Yonggang Luo <luoyonggang at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15706>

---

 .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 5d5f0f3740c..d9648d64867 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -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 `