diff --git a/base/fei_EqnCommMgr.cpp b/base/fei_EqnCommMgr.cpp
index 9299e9bf438..7b0d8e21e89 100644
--- a/base/fei_EqnCommMgr.cpp
+++ b/base/fei_EqnCommMgr.cpp
@@ -741,9 +741,9 @@ void EqnCommMgr::exchangeSoln()
 }
 
 //------------------------------------------------------------------------------
-// This works around an issue with the ARMHPC 20.1 compiler
+// This works around an issue with the clang and ARMHPC compiler
 // Needs to be revisited with later versions
-#ifdef __ARM_HPC_COMPILER_VERSION__
+#if defined (__clang__) && ! defined(__INTEL_CLANG_COMPILER)
 __attribute__((optnone))
 #endif
 int EqnCommMgr::mirrorProcEqns(ProcEqns& inProcEqns, ProcEqns& outProcEqns)