From 8542a737f116059dad539b4a388ffc493003d280 Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Sun, 3 May 2020 19:21:35 -0700 Subject: Remove compiler option from `fpm.toml` --- src/Fpm.hs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Fpm.hs b/src/Fpm.hs index afe9a70..c10f7b0 100644 --- a/src/Fpm.hs +++ b/src/Fpm.hs @@ -47,8 +47,7 @@ import qualified Toml data Arguments = Arguments { command' :: Command, release :: Bool } data TomlSettings = TomlSettings { - tomlSettingsCompiler :: String - , tomlSettingsProjectName :: String + tomlSettingsProjectName :: String , tomlSettingsLibrary :: (Maybe Library) , tomlSettingsExecutables :: [Executable] , tomlSettingsTests :: [Executable] @@ -200,9 +199,7 @@ getDirectoriesFiles dirs exts = getDirectoryFilesIO "" newPatterns settingsCodec :: TomlCodec TomlSettings settingsCodec = TomlSettings - <$> Toml.string "compiler" - .= tomlSettingsCompiler - <*> Toml.string "name" + <$> Toml.string "name" .= tomlSettingsProjectName <*> Toml.dioptional (Toml.table libraryCodec "library") .= tomlSettingsLibrary @@ -233,7 +230,7 @@ toml2AppSettings tomlSettings release = do projectName testSettings <- getTestSettings $ tomlSettingsTests tomlSettings return AppSettings - { appSettingsCompiler = tomlSettingsCompiler tomlSettings + { appSettingsCompiler = "gfortran" , appSettingsProjectName = projectName , appSettingsBuildPrefix = "build" if release then "release" else "debug" -- cgit v1.2.3