From 66871e9de1b121a7e0e3ad1c739450b7eefaf7ee Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Mon, 3 Feb 2025 22:38:33 +0200 Subject: [PATCH] make/rules-meson.mk: Don't force the C++ standard. We got some build failures with DXVK-NVAPI due to this. They even have CI that uses Proton SDK images but since we create our own cross files they were not anticipating that we may be forcing a C++ standard version. Since everything builds and none of the meson-using subprojects seems to be setting the version via their provided corss files we should be good to just drop it. --- make/rules-meson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/rules-meson.mk b/make/rules-meson.mk index 985f2085..fe71f6ab 100644 --- a/make/rules-meson.mk +++ b/make/rules-meson.mk @@ -24,7 +24,7 @@ pkgconfig = '$$$$PKG_CONFIG' [properties] needs_exe_wrapper = true c_args = [$$(call list-quote,$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)))] -cpp_args = [$$(call list-quote,$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17)] +cpp_args = [$$(call list-quote,$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)))] link_args = [$$(call list-quote,$$($(2)_LIBFLAGS$(3)) $$($(2)_LDFLAGS$(3)) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS))] pkg_config_libdir = '$$$$CROSSPKG_CONFIG_LIBDIR'