diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index a6585543d..758b1c3ab 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -1311,8 +1311,6 @@ class CompilerType(enum.Enum):
 
     PGI_STANDARD = 50
 
-    FLANG_STANDARD = 60
-
     @property
     def is_standard_compiler(self):
         return self.name in ('GCC_STANDARD', 'CLANG_STANDARD', 'ICC_STANDARD')
@@ -1625,29 +1623,6 @@ class PGICompiler:
         return []
 
 
-class FlangCompiler:
-    def __init__(self, compiler_type):
-        self.id = 'flang'
-        self.compiler_type = compiler_type
-
-        default_warn_args = ['-Minform=inform']
-        self.warn_args = {'1': default_warn_args,
-                          '2': default_warn_args,
-                          '3': default_warn_args}
-
-        def get_module_incdir_args(self):
-            return ('-module', )
-
-        def get_no_warn_args(self):
-            return ['-silent']
-
-        def openmp_flags(self):
-            return ['-mp']
-
-    def get_allow_undefined_link_args(self):
-        return []
-
-
 class ElbrusCompiler(GnuCompiler):
     # Elbrus compiler is nearly like GCC, but does not support
     # PCH, LTO, sanitizers and color output as of version 1.21.x.
diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
index 3387ddaa2..57d1dd900 100644
--- a/mesonbuild/compilers/fortran.py
+++ b/mesonbuild/compilers/fortran.py
@@ -22,7 +22,7 @@ from .compilers import (
     clike_debug_args,
     Compiler,
     GnuCompiler,
-    FlangCompiler,
+    ClangCompiler,
     ElbrusCompiler,
     IntelCompiler,
     PGICompiler
@@ -383,10 +383,15 @@ class PGIFortranCompiler(PGICompiler, FortranCompiler):
         return val
 
 
-class FlangFortranCompiler(FlangCompiler, FortranCompiler):
+class FlangFortranCompiler(ClangCompiler, FortranCompiler):
     def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwags):
         FortranCompiler.__init__(self, exelist, version, is_cross, exe_wrapper, **kwags)
-        FlangCompiler.__init__(self, CompilerType.FLANG_STANDARD)
+        ClangCompiler.__init__(self, CompilerType.CLANG_STANDARD)
+        self.id = 'flang'
+        default_warn_args = ['-Minform=inform']
+        self.warn_args = {'1': default_warn_args,
+                          '2': default_warn_args,
+                          '3': default_warn_args}
 
 
 class Open64FortranCompiler(FortranCompiler):