diff options
author | Brad Richardson <brichardson@structint.com> | 2020-05-03 19:21:35 -0700 |
---|---|---|
committer | Brad Richardson <brichardson@structint.com> | 2020-05-03 19:21:35 -0700 |
commit | 8542a737f116059dad539b4a388ffc493003d280 (patch) | |
tree | 1ec4a97342e9e5603342d5cb8b45c5a66c9a2a2e /src/Fpm.hs | |
parent | ed5dd080d45ea4a409e63a5f9b2ff26f1d82d2db (diff) | |
download | fpm-8542a737f116059dad539b4a388ffc493003d280.tar.gz fpm-8542a737f116059dad539b4a388ffc493003d280.zip |
Remove compiler option from `fpm.toml`
Diffstat (limited to 'src/Fpm.hs')
-rw-r--r-- | src/Fpm.hs | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -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" |