diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-21 16:49:17 -0500 |
|---|---|---|
| committer | Brad Richardson <everythingfunctional@protonmail.com> | 2020-10-21 16:49:17 -0500 |
| commit | e26feb52cc82bc58ea124e61473363829cf81c81 (patch) | |
| tree | 9a674a506aa1fae8f96fbc0c488defe9e0aed190 | |
| parent | 25620576674d729a472951d4c03d7aadbbfa2057 (diff) | |
| download | fpm-e26feb52cc82bc58ea124e61473363829cf81c81.tar.gz fpm-e26feb52cc82bc58ea124e61473363829cf81c81.zip | |
convert programDirectory path to native in buildProgram
| -rw-r--r-- | bootstrap/src/Build.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs index 68a8e3c..ce8ea1d 100644 --- a/bootstrap/src/Build.hs +++ b/bootstrap/src/Build.hs @@ -60,12 +60,11 @@ 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 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{}) = |