Remove standard flag from compilation flags if C++ compiler is being used on a C source file

Author: langmm

yggdrasil/drivers/CPPModelDriver.py

@@ -18,22 +18,47 @@ class CPPCompilerBase(CCompilerBase):
     default_executable = None
 
     @classmethod
-    def add_standard_flag(cls, flags):
-        r"""Add a standard flag to the list of flags.
+    def find_standard_flag(cls, flags):
+        r"""Locate the standard flag in a list of flags.
 
         Args:
             flags (list): Compilation flags.
 
+        Returns:
+            int: Index of the standard flag. -1 if not present.
+
         """
-        std_flag = None
         for i, a in enumerate(flags):
             if a.startswith('-std='):
-                std_flag = i
-                break
-        if std_flag is None:
+                return i
+        return -1
+
+    @classmethod
+    def add_standard_flag(cls, flags):
+        r"""Add a standard flag to the list of flags.
+
+        Args:
+            flags (list): Compilation flags.
+
+        """
+        std_flag_idx = cls.find_standard_flag(flags)
+        if std_flag_idx == -1:
             flags.append('-std=%s' % cls.cpp_std)
         return flags
 
+    def remove_standard_flag(cls, flags):
+        r"""Remove the standard flag from a list of flags if one is
+        present.
+
+        Args:
+            flags (list): Compilation flags.
+
+        """
+        std_flag_idx = cls.find_standard_flag(flags)
+        if std_flag_idx != -1:
+            del flags[std_flag_idx]
+        return flags
+
 
 class GPPCompiler(CPPCompilerBase, GCCCompiler):
     r"""Interface class for G++ compiler/linker."""
@@ -55,8 +80,10 @@ def get_flags(cls, skip_standard_flag=False, **kwargs):
 
         """
         out = super(GPPCompiler, cls).get_flags(**kwargs)
-        # Add standard library flag
-        if not skip_standard_flag:
+        # Add/remove standard library flag
+        if skip_standard_flag:
+            out = cls.remove_standard_flag(out)
+        else:
             out = cls.add_standard_flag(out)
         return out
 
@@ -94,8 +121,10 @@ def get_flags(cls, skip_standard_flag=False, **kwargs):
 
         """
         out = super(ClangPPCompiler, cls).get_flags(**kwargs)
-        # Add standard library flag
-        if not skip_standard_flag:
+        # Add/remove standard library flag
+        if skip_standard_flag:
+            out = cls.remove_standard_flag(out)
+        else:
             out = cls.add_standard_flag(out)
         return out