diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-22 13:50:58 -0500 |
|---|---|---|
| committer | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-22 13:50:58 -0500 |
| commit | e7b135b834f79f819fbe27e616a3fdff155b0fdc (patch) | |
| tree | b681115e4a780a94c11701f4070f3bd19e468fee | |
| parent | 5f16555d030ff120d5175477886473de40654659 (diff) | |
| download | fpm-e7b135b834f79f819fbe27e616a3fdff155b0fdc.tar.gz fpm-e7b135b834f79f819fbe27e616a3fdff155b0fdc.zip | |
convert buildDirectory path to native in buildProgram
| -rw-r--r-- | bootstrap/src/Build.hs | 6 |
1 files changed, 2 insertions, 4 deletions
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) |