From d984d8a2e2c7348e5aa35da8ce8e1b2f5de44f6a Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Tue, 16 May 2023 10:05:03 +0200
Subject: [PATCH] aco: use c++17

std::map::try_emplace requires C++17, so we need to make sure we're
compiling with C++17 enabled.

Fixes: 8aff7152a0f ("aco: make IDSet sparse")
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23047>
(cherry picked from commit df1d1ccb37c42698a3188d10b431cb4e284a100c)
---
 .pick_status.json            | 2 +-
 src/amd/compiler/meson.build | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index c2042d33b2c..3d26581b9a2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2092,7 +2092,7 @@
         "description": "aco: use c++17",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8aff7152a0f9848083a522ed5e352d8ac1469fc2"
     },
diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build
index 8016495dac9..b5b92f11d5e 100644
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@@ -96,6 +96,7 @@ _libaco = static_library(
   gnu_symbol_visibility : 'hidden',
   build_by_default : true,
   cpp_args : [cpp_args_aco, cpp_msvc_compat_args],
+  override_options: ['cpp_std=c++17'],
 )
 
 # Also link with aco