diff options
| author | Milan Curcic <caomaco@gmail.com> | 2020-05-04 08:32:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 08:32:24 -0400 |
| commit | 736b2a7f29b57217af282dfc7fb316d5091a306d (patch) | |
| tree | 93cd02b2f45d20623f7fd9723472985dfa451f48 /src | |
| parent | cf23a1342224a26a4aa42f4582bf00d1c6444e7c (diff) | |
| parent | 54f871cc0e9c63361e72068262f2458490a180ef (diff) | |
| download | fpm-736b2a7f29b57217af282dfc7fb316d5091a306d.tar.gz fpm-736b2a7f29b57217af282dfc7fb316d5091a306d.zip | |
Merge pull request #72 from everythingfunctional/RemoveCompilerOption
Remove compiler option from `fpm.toml`
Diffstat (limited to 'src')
| -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] @@ -204,9 +203,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 @@ -237,7 +234,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" |