From e7b135b834f79f819fbe27e616a3fdff155b0fdc Mon Sep 17 00:00:00 2001 From: Brad Richardson Date: Thu, 22 Oct 2020 13:50:58 -0500 Subject: convert buildDirectory path to native in buildProgram --- bootstrap/src/Build.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs index fc339e7..083e646 100644 --- a/bootstrap/src/Build.hs +++ b/bootstrap/src/Build.hs @@ -61,20 +61,18 @@ buildProgram -> FilePath -> [FilePath] -> IO () -buildProgram programDirectory' libraryDirectories sourceExtensions buildDirectory compiler flags programName programSource archives +buildProgram programDirectory' libraryDirectories sourceExtensions buildDirectory' compiler flags programName programSource archives = do let programDirectory = foldl1 () (splitDirectories programDirectory') + let buildDirectory = foldl1 () (splitDirectories buildDirectory') let includeFlags = map ("-I" ++) libraryDirectories sourceFiles <- getDirectoriesFiles [programDirectory] sourceExtensions - print sourceFiles - print (programDirectory programSource) rawSources <- mapM sourceFileToRawSource sourceFiles let sources' = map processRawSource rawSources let isThisProgramOrNotProgram p@(Program{}) = programSourceFileName p == programDirectory programSource isThisProgramOrNotProgram _ = True let sources = filter isThisProgramOrNotProgram sources' - print (map getSourceFileName sources) let availableModules = getAvailableModules sources let compileTimeInfo = map (\s -> constructCompileTimeInfo s availableModules buildDirectory) -- cgit v1.2.3