From 7fddec617c16ed4c89ca6da6f62ab89c82fac604 Mon Sep 17 00:00:00 2001
From: Joseph Cloutier <jkcloutier@gmail.com>
Date: Fri, 13 May 2022 18:58:34 -0400
Subject: [PATCH] Consistently check for Clang.

---
 project/lib/openal-files.xml | 2 +-
 project/lib/pixman-files.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/lib/openal-files.xml b/project/lib/openal-files.xml
index 2cf01514b..b60cfc251 100644
--- a/project/lib/openal-files.xml
+++ b/project/lib/openal-files.xml
@@ -153,7 +153,7 @@
 
         <section if="android">
 
-            <compilerflag value="-Wno-psabi" unless="HXCPP_CLANG" />
+            <compilerflag value="-Wno-psabi" unless="HXCPP_CLANG || NDKV20+" />
             <compilerflag value="-fsigned-char" />
 
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/opensl.cpp" />
diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml
index c1d877ac1..d10c8f0a3 100644
--- a/project/lib/pixman-files.xml
+++ b/project/lib/pixman-files.xml
@@ -7,7 +7,7 @@
 
 	<files id="native-toolkit-pixman" >
 
-		<compilerflag value="-fno-integrated-as" if="NDKV20+" />
+		<compilerflag value="-fno-integrated-as" if="HXCPP_CLANG || NDKV20+" />
 
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman" />
 		<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/pixman/pixman" />