From 34cf7fd7547100ab027a0219133a48b2691464b9 Mon Sep 17 00:00:00 2001
From: Rohit Goswami <rog32@hi.is>
Date: Mon, 8 Apr 2024 01:16:52 +0000
Subject: [PATCH] MAINT: Generalize and setup F_INTERFACE

---
 interface/meson.build |  2 --
 kernel/meson.build    |  2 --
 meson.build           | 22 ++++++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/interface/meson.build b/interface/meson.build
index 476140d81..71aa33f22 100644
--- a/interface/meson.build
+++ b/interface/meson.build
@@ -84,8 +84,6 @@ _static_libs += static_library(
     include_directories:  _inc,
     c_args: [
         '-m64',
-        '-DF_INTERFACE_GFORT',
-        '-fPIC',
         '-DSMP_SERVER',
         '-DNO_WARMUP',
         '-DMAX_CPU_NUMBER=12',
diff --git a/kernel/meson.build b/kernel/meson.build
index 946cc5301..51c6a2f17 100644
--- a/kernel/meson.build
+++ b/kernel/meson.build
@@ -787,8 +787,6 @@ _configs = [
    'def': ['DOUBLE'],
    'addl': [fma3_flag,
         '-m64',
-        '-DF_INTERFACE_GFORT',
-        '-fPIC',
         '-DSMP_SERVER',
         '-DNO_WARMUP',
         '-DMAX_CPU_NUMBER=12',
diff --git a/meson.build b/meson.build
index 693a46f37..cbe55e7e9 100644
--- a/meson.build
+++ b/meson.build
@@ -21,6 +21,13 @@ openblas_version = f'@openblas_major_version@.@openblas_minor_version@.@openblas
 
 # Skip the check for valid CC
 cc = meson.get_compiler('c')
+fc = meson.get_compiler('fortran')
+fc_id = fc.get_id()
+
+# Common args
+_args = []
+_cargs = []
+_fargs = []
 
 # System configuration
 build_single = get_option('build_single')
@@ -146,6 +153,21 @@ if cpu_fam in ['x86_64', 'ppc64', 'ppc']
   ], language:'c')
 endif
 
+if fc_id == 'gcc'
+    add_project_arguments('-DF_INTERFACE_GFORT', language: 'c')
+elif fc_id == 'g95'
+    add_project_arguments('-DF_INTERFACE_G95', language: 'c')
+elif fc_id == 'flang'
+    add_project_arguments('-DF_INTERFACE_FLANG', language: 'c')
+elif fc_id in ['intel', 'intel-cl']
+    add_project_arguments('-DF_INTERFACE_INTEL', language: 'c')
+elif fc_id == 'pathscale'
+    add_project_arguments('-DF_INTERFACE_PATHSCALE', language: 'c')
+elif fc_id == 'pgi'
+    add_project_arguments('-DF_INTERFACE_PGI', language: 'c')
+elif fc_id == 'sun'
+    add_project_arguments('-DF_INTERFACE_SUN', language: 'c')
+endif
 
 # Ignoring other hostarch checks and conflicts for arch in BSD for now
 _inc = include_directories('.')