From 12717325ccb5afeb686c8ddd02f9c9b623021f86 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 29 Jul 2024 12:16:05 -0400
Subject: [PATCH] Make sure we use `-isystem` with Meson on some deps

Otherwise we get warnings on external code.
---
 src/libexpr/meson.build               | 8 +++++++-
 src/libexpr/primops/fromTOML.cc       | 3 ---
 src/libstore/meson.build              | 3 ++-
 src/libstore/s3-binary-cache-store.cc | 3 ---
 src/libutil/meson.build               | 1 +
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build
index fa90e7b41..4d8a38b43 100644
--- a/src/libexpr/meson.build
+++ b/src/libexpr/meson.build
@@ -32,6 +32,7 @@ subdir('build-utils-meson/threads')
 boost = dependency(
   'boost',
   modules : ['container', 'context'],
+  include_type: 'system',
 )
 # boost is a public dependency, but not a pkg-config dependency unfortunately, so we
 # put in `deps_other`.
@@ -55,7 +56,12 @@ if bdw_gc.found()
 endif
 configdata.set('HAVE_BOEHMGC', bdw_gc.found().to_int())
 
-toml11 = dependency('toml11', version : '>=3.7.0', method : 'cmake')
+toml11 = dependency(
+  'toml11',
+  version : '>=3.7.0',
+  method : 'cmake',
+  include_type: 'system',
+)
 deps_other += toml11
 
 config_h = configure_file(
diff --git a/src/libexpr/primops/fromTOML.cc b/src/libexpr/primops/fromTOML.cc
index 70755f9e0..b4f1df7a8 100644
--- a/src/libexpr/primops/fromTOML.cc
+++ b/src/libexpr/primops/fromTOML.cc
@@ -3,10 +3,7 @@
 
 #include <sstream>
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-enum"
 #include <toml.hpp>
-#pragma GCC diagnostic pop
 
 namespace nix {
 
diff --git a/src/libstore/meson.build b/src/libstore/meson.build
index cb8110f3f..50b15e15d 100644
--- a/src/libstore/meson.build
+++ b/src/libstore/meson.build
@@ -73,6 +73,7 @@ subdir('build-utils-meson/threads')
 boost = dependency(
   'boost',
   modules : ['container'],
+  include_type: 'system',
 )
 # boost is a public dependency, but not a pkg-config dependency unfortunately, so we
 # put in `deps_other`.
@@ -113,7 +114,7 @@ if aws_s3.found()
       '-laws-cpp-sdk-core',
       '-laws-crt-cpp',
     ],
-  )
+  ).as_system('system')
 endif
 deps_other += aws_s3
 
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 1082657bb..92ab47cd6 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -10,8 +10,6 @@
 #include "compression.hh"
 #include "filetransfer.hh"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wswitch-enum"
 #include <aws/core/Aws.h>
 #include <aws/core/VersionConfig.h>
 #include <aws/core/auth/AWSCredentialsProvider.h>
@@ -27,7 +25,6 @@
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/PutObjectRequest.h>
 #include <aws/transfer/TransferManager.h>
-#pragma GCC diagnostic pop
 
 using namespace Aws::Transfer;
 
diff --git a/src/libutil/meson.build b/src/libutil/meson.build
index 04c778c31..8552c4c9d 100644
--- a/src/libutil/meson.build
+++ b/src/libutil/meson.build
@@ -62,6 +62,7 @@ endif
 boost = dependency(
   'boost',
   modules : ['context', 'coroutine'],
+  include_type: 'system',
 )
 # boost is a public dependency, but not a pkg-config dependency unfortunately, so we
 # put in `deps_other`.