diff --git a/lib/xml.h b/lib/xml.h
index 3e19d25a3d6..86377f77dac 100644
--- a/lib/xml.h
+++ b/lib/xml.h
@@ -25,12 +25,14 @@
 SUPPRESS_WARNING_CLANG_PUSH("-Wzero-as-null-pointer-constant")
 SUPPRESS_WARNING_CLANG_PUSH("-Wsuggest-destructor-override")
 SUPPRESS_WARNING_CLANG_PUSH("-Winconsistent-missing-destructor-override")
+SUPPRESS_WARNING_CLANG_PUSH("-Wformat") // happens with libc++ only
 
 #include <tinyxml2.h> // IWYU pragma: export
 
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
 SUPPRESS_WARNING_CLANG_POP
+SUPPRESS_WARNING_CLANG_POP
 
 inline static tinyxml2::XMLError xml_LoadFile(tinyxml2::XMLDocument& doc, const char* filename)
 {
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
index e7e6d3b047a..0f6755c91b4 100644
--- a/test/testmathlib.cpp
+++ b/test/testmathlib.cpp
@@ -657,7 +657,7 @@ class TestMathLib : public TestFixture {
 
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: invalid");
 
-#ifdef _LIBCPP_VERSION
+#if defined(_LIBCPP_VERSION) && (defined(__APPLE__) && defined(__MACH__))
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1invalid");
         ASSERT_THROW_INTERNAL_EQUALS(MathLib::toDoubleNumber("1.1invalid"), INTERNAL, "Internal Error. MathLib::toDoubleNumber: conversion failed: 1.1invalid");
 #else