diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-28 09:39:22 -0500 |
|---|---|---|
| committer | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-28 09:39:22 -0500 |
| commit | 55f9d0539bc30e198796e4f60ae3e011513afb69 (patch) | |
| tree | c1245ae486345e965668a3712f9cd668457a81fb | |
| parent | 339efd6e4c371366f4541676644b624af51f8097 (diff) | |
| download | fpm-55f9d0539bc30e198796e4f60ae3e011513afb69.tar.gz fpm-55f9d0539bc30e198796e4f60ae3e011513afb69.zip | |
Use compiler version and flags to construct build folder name
| -rw-r--r-- | bootstrap/package.yaml | 1 | ||||
| -rw-r--r-- | bootstrap/src/Fpm.hs | 63 |
2 files changed, 36 insertions, 28 deletions
diff --git a/bootstrap/package.yaml b/bootstrap/package.yaml index 26a7f74..1f5d0fd 100644 --- a/bootstrap/package.yaml +++ b/bootstrap/package.yaml @@ -25,6 +25,7 @@ dependencies: - directory - extra - filepath +- hashable - MissingH - optparse-applicative - process diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs index cee04af..0c2af57 100644 --- a/bootstrap/src/Fpm.hs +++ b/bootstrap/src/Fpm.hs @@ -16,6 +16,7 @@ import Control.Monad.Extra ( concatMapM , forM_ , when ) +import Data.Hashable (hash) import Data.List ( isSuffixOf , find , nub @@ -29,6 +30,7 @@ import Development.Shake ( FilePattern import Development.Shake.FilePath ( (</>) , (<.>) , exe + , splitDirectories ) import Options.Applicative ( Parser , (<**>) @@ -59,7 +61,7 @@ import System.Directory ( createDirectory import System.Exit ( ExitCode(..) , exitWith ) -import System.Process ( runCommand +import System.Process ( readProcess , system ) import Toml ( TomlCodec @@ -502,36 +504,37 @@ toml2AppSettings tomlSettings args = do (tomlSettingsExecutables tomlSettings) projectName testSettings <- getTestSettings $ tomlSettingsTests tomlSettings - buildPrefix <- makeBuildPrefix compiler release + let flags = if release + then + [ "-Wall" + , "-Wextra" + , "-Wimplicit-interface" + , "-fPIC" + , "-fmax-errors=1" + , "-O3" + , "-march=native" + , "-ffast-math" + , "-funroll-loops" + ] + else + [ "-Wall" + , "-Wextra" + , "-Wimplicit-interface" + , "-fPIC" + , "-fmax-errors=1" + , "-g" + , "-fbounds-check" + , "-fcheck-array-temporaries" + , "-fbacktrace" + ] + buildPrefix <- makeBuildPrefix compiler flags let dependencies = tomlSettingsDependencies tomlSettings let devDependencies = tomlSettingsDevDependencies tomlSettings return AppSettings { appSettingsCompiler = compiler , appSettingsProjectName = projectName , appSettingsBuildPrefix = buildPrefix - , appSettingsFlags = if release - then - [ "-Wall" - , "-Wextra" - , "-Wimplicit-interface" - , "-fPIC" - , "-fmax-errors=1" - , "-O3" - , "-march=native" - , "-ffast-math" - , "-funroll-loops" - ] - else - [ "-Wall" - , "-Wextra" - , "-Wimplicit-interface" - , "-fPIC" - , "-fmax-errors=1" - , "-g" - , "-fbounds-check" - , "-fcheck-array-temporaries" - , "-fbacktrace" - ] + , appSettingsFlags = flags , appSettingsLibrary = librarySettings , appSettingsExecutables = executableSettings , appSettingsTests = testSettings @@ -587,11 +590,15 @@ getTestSettings [] = do else return [] getTestSettings tests = return tests -makeBuildPrefix :: String -> Bool -> IO String -makeBuildPrefix compiler release = +makeBuildPrefix :: FilePath -> [String] -> IO FilePath +makeBuildPrefix compiler flags = do -- TODO Figure out what other info should be part of this -- Probably version, and make sure to not include path to the compiler - return $ "build" </> compiler ++ "_" ++ if release then "release" else "debug" + versionInfo <- readProcess compiler ["--version"] [] + let compilerName = last (splitDirectories compiler) + let versionHash = hash versionInfo + let flagsHash = hash flags + return $ "build" </> compilerName ++ "_" ++ show versionHash ++ "_" ++ show flagsHash {- Fetching the dependencies is done on a sort of breadth first approach. All |