From 8c0c63eb0da8be6e3ad827ab5fae7bae01f95b92 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 1 Jun 2024 13:58:36 +0100
Subject: Fix setting of pedantic warnings

Disable for Clang, because annoyingly to treats preprocessor line
numbers as a GNU extension and thus falls over when used with DistCC.
---
 Jamroot.jam      | 4 ++--
 test/Jamfile.jam | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jamroot.jam b/Jamroot.jam
index 712ad63..2c900ae 100644
--- a/Jamroot.jam
+++ b/Jamroot.jam
@@ -71,13 +71,13 @@ lib ilt :
 	:
 	<define>GLM_FORCE_SWIZZLE
 	<define>GLM_ENABLE_EXPERIMENTAL
-	<variant>debug:<warnings>pedantic
+	<toolset>gcc,<variant>debug:<warnings>pedantic
+	<toolset>clang,<variant>debug:<warnings>extra
 	<variant>debug:<warnings-as-errors>on
 	<variant>debug:<cflags>-Wnon-virtual-dtor
 	<variant>debug:<cflags>-Wcast-align
 	<variant>debug:<cflags>-Wunused
 	<variant>debug:<cflags>-Woverloaded-virtual
-	<variant>debug:<cflags>-Wpedantic
 	<variant>debug:<cflags>-Wconversion
 	<variant>debug:<cflags>-Wsign-conversion
 	<variant>debug:<cflags>-Wnull-dereference
diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index cce4513..f021d85 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -13,13 +13,13 @@ project : requirements
 	<define>RESDIR=\\\"$(res)/\\\"
 	<define>FIXTURESDIR=\\\"$(fixtures)/\\\"
 	<define>GLM_FORCE_SWIZZLE
-	<variant>debug:<warnings>pedantic
+	<toolset>gcc,<variant>debug:<warnings>pedantic
+	<toolset>clang,<variant>debug:<warnings>extra
 	<variant>debug:<warnings-as-errors>on
 	<variant>debug:<cflags>-Wnon-virtual-dtor
 	<variant>debug:<cflags>-Wcast-align
 	<variant>debug:<cflags>-Wunused
 	<variant>debug:<cflags>-Woverloaded-virtual
-	<variant>debug:<cflags>-Wpedantic
 	<variant>debug:<cflags>-Wconversion
 	<variant>debug:<cflags>-Wsign-conversion
 	<variant>debug:<cflags>-Wnull-dereference
-- 
cgit v1.2.3