From c8e97ed801b6e781055d539550577640b2357e59 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 27 Nov 2017 13:12:18 +0200
Subject: Use compiler class instead of id where appropriate

---
 build/root.build | 2 +-
 mysql/buildfile  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/root.build b/build/root.build
index 79a2c0e..7615d73 100644
--- a/build/root.build
+++ b/build/root.build
@@ -16,7 +16,7 @@ c{*}: extension = c
 #
 using cxx.guess
 
-cxx.std = ($cxx.id == 'gcc' || $cxx.id == 'clang' ? gnu++98 : 03)
+cxx.std = ($cxx.class == 'gcc' ? gnu++98 : 03)
 
 using cxx
 
diff --git a/mysql/buildfile b/mysql/buildfile
index f3f5339..1c7b0ef 100644
--- a/mysql/buildfile
+++ b/mysql/buildfile
@@ -190,13 +190,13 @@ libmysql/:   cc.poptions += $sql_poptions
 if ($tclass == 'windows')
   libmysql/authentication_win/: cc.poptions += -DSECURITY_WIN32
 
-if ($tsys == 'win32-msvc')
+if ($c.class == 'msvc')
 {
   # Disable warnings that pop up with /W3.
   #
   cc.coptions += /wd4311 /wd4113 /wd4996 /wd4244 /wd4267 /wd4334 /wd4800 /wd4091
 }
-else
+elif ($c.class == 'gcc')
 {
   # We don't care about C++ ABI specification conformance, especially given
   # that only C functions are exported. So we omit -fabi-version=2.
-- 
cgit v1.1