From a07bf3fb3fc07a2c3bf13f8c36a158108a38cefa Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Thu, 29 Oct 2020 11:56:15 -0500 Subject: Change build directory hashes to hex format --- bootstrap/src/Fpm.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs index c23263e..18831d8 100644 --- a/bootstrap/src/Fpm.hs +++ b/bootstrap/src/Fpm.hs @@ -33,6 +33,7 @@ import Development.Shake.FilePath ( () , exe , splitDirectories ) +import Numeric (showHex) import Options.Applicative ( Parser , (<**>) , (<|>) @@ -681,15 +682,15 @@ makeBuildPrefix compiler flags = do -- Probably version, and make sure to not include path to the compiler versionInfo <- readProcess compiler ["--version"] [] let compilerName = last (splitDirectories compiler) - let versionHash = hash versionInfo - let flagsHash = hash flags + let versionHash = abs (hash versionInfo) + let flagsHash = abs (hash flags) return $ "build" compilerName ++ "_" - ++ show versionHash + ++ showHex versionHash "" ++ "_" - ++ show flagsHash + ++ showHex flagsHash "" {- Fetching the dependencies is done on a sort of breadth first approach. All -- cgit v1.2.3