feat(bootstrap): Add support for same compilers as Fortran version

2 files changed, 183 insertions, 2 deletions

diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs
index 32d1979..8caf0c9 100644
--- a/bootstrap/src/Build.hs
+++ b/bootstrap/src/Build.hs
@@ -75,7 +75,7 @@ buildProgram programDirectory' libraryDirectories sourceExtensions buildDirector
     libraryModules <- findAvailableModules libraryDirectories
     let programDirectory = foldl1 (</>) (splitDirectories programDirectory')
     let buildDirectory   = foldl1 (</>) (splitDirectories buildDirectory')
-    let includeFlags     = map (includeFlag ++) libraryDirectories
+    let includeFlags     = (includeFlag ++ buildDirectory) : map (includeFlag ++) libraryDirectories
     sourceFiles <- getDirectoriesFiles [programDirectory] sourceExtensions
     rawSources  <- mapM sourceFileToRawSource sourceFiles
     let sources' = map processRawSource rawSources
@@ -130,7 +130,7 @@ buildLibrary
 buildLibrary libraryDirectory sourceExtensions buildDirectory (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) libraryName otherLibraryDirectories
   = do
     otherModules <- findAvailableModules otherLibraryDirectories
-    let includeFlags = map (includeFlag ++) otherLibraryDirectories
+    let includeFlags = (includeFlag ++ buildDirectory) : map (includeFlag ++) otherLibraryDirectories
     sourceFiles <- getDirectoriesFiles [libraryDirectory] sourceExtensions
     rawSources  <- mapM sourceFileToRawSource sourceFiles
     let sources          = map processRawSource rawSources
diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs
index 9fc1c91..294c77d 100644
--- a/bootstrap/src/Fpm.hs
+++ b/bootstrap/src/Fpm.hs
@@ -690,6 +690,187 @@ defineCompilerSettings specifiedFlags compiler release
                                   , compilerSettingsModuleFlag  = "-J"
                                   , compilerSettingsIncludeFlag = "-I"
                                   }
+  | "f95" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              [ "-O3"
+              , "-Wimplicit-interface"
+              , "-fPIC"
+              , "-fmax-errors=1"
+              , "-ffast-math"
+              , "-funroll-loops"
+              ]
+            else
+              [ "-Wall"
+              , "-Wextra"
+              , "-Wimplicit-interface"
+              , "-fPIC"
+              , "-fmax-errors=1"
+              , "-g"
+              , "-fbounds-check"
+              , "-fcheck-array-temporaries"
+              , "-Wno-maybe-uninitialized"
+              , "-Wno-uninitialized"
+              , "-fbacktrace"
+              ]
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-J"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "nvfortran" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              [ "-Mbackslash"
+              ]
+            else
+              [ "-Minform=inform"
+              , "-Mbackslash"
+              , "-g"
+              , "-Mbounds"
+              , "-Mchkptr"
+              , "-Mchkstk"
+              , "-traceback"
+              ]
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-module"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "ifort" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              [ "-fp-model precise"
+              , "-pc 64"
+              , "-align all"
+              , "-coarray"
+              , "-error-limit 1"
+              , "-reentrancy threaded"
+              , "-nogen-interfaces"
+              , "-assume byterecl"
+              , "-assume nounderscore"
+              ]
+            else
+              [ "-warn all"
+              , "-check:all:noarg_temp_created"
+              , "-coarray"
+              , "-error-limit 1"
+              , "-O0"
+              , "-g"
+              , "-assume byterecl"
+              , "-traceback"
+              ]
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-module"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "ifx" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              []
+            else
+              []
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-module"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "pgfortran" `isInfixOf` compiler || "pgf90" `isInfixOf` compiler || "pgf95" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              []
+            else
+              []
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-module"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "flang" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              []
+            else
+              []
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-module"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "lfc" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              []
+            else
+              []
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-M"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "nagfor" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              [ "-O4"
+              , "-coarray=single"
+              , "-PIC"
+              ]
+            else
+              [ "-g"
+              , "-C=all"
+              , "-O0"
+              , "-gline"
+              , "-coarray=single"
+              , "-PIC"
+              ]
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-mdir"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "crayftn" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              []
+            else
+              []
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-J"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
+  | "xlf90" `isInfixOf` compiler
+  = let flags = case specifiedFlags of
+          [] -> if release
+            then
+              []
+            else
+              []
+          fs -> fs
+  in  return $ CompilerSettings { compilerSettingsCompiler    = compiler
+                                , compilerSettingsFlags       = flags
+                                , compilerSettingsModuleFlag  = "-qmoddir"
+                                , compilerSettingsIncludeFlag = "-I"
+                                }
   | otherwise
   = do
     putStrLn $ "Sorry, compiler is currently unsupported: " ++ compiler