diff options
| author | Brad Richardson <everythingfunctional@protonmail.com> | 2020-12-09 14:10:50 -0600 |
|---|---|---|
| committer | Brad Richardson <everythingfunctional@protonmail.com> | 2020-12-09 14:10:50 -0600 |
| commit | e27befb0031c5743e2ed30ec713a365e754c485d (patch) | |
| tree | 63765c0f2dfb0a2c3907078c8d2d1d067ed8052f /bootstrap/src/Build.hs | |
| parent | a062554e80c3718881c1be8edb0e7220e37fbd23 (diff) | |
| download | fpm-e27befb0031c5743e2ed30ec713a365e754c485d.tar.gz fpm-e27befb0031c5743e2ed30ec713a365e754c485d.zip | |
feat(bootstrap): Add support for same compilers as Fortran version
Diffstat (limited to 'bootstrap/src/Build.hs')
| -rw-r--r-- | bootstrap/src/Build.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs index 32d1979..8caf0c9 100644 --- a/bootstrap/src/Build.hs +++ b/bootstrap/src/Build.hs @@ -75,7 +75,7 @@ buildProgram programDirectory' libraryDirectories sourceExtensions buildDirector libraryModules <- findAvailableModules libraryDirectories let programDirectory = foldl1 (</>) (splitDirectories programDirectory') let buildDirectory = foldl1 (</>) (splitDirectories buildDirectory') - let includeFlags = map (includeFlag ++) libraryDirectories + let includeFlags = (includeFlag ++ buildDirectory) : map (includeFlag ++) libraryDirectories sourceFiles <- getDirectoriesFiles [programDirectory] sourceExtensions rawSources <- mapM sourceFileToRawSource sourceFiles let sources' = map processRawSource rawSources @@ -130,7 +130,7 @@ buildLibrary buildLibrary libraryDirectory sourceExtensions buildDirectory (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) libraryName otherLibraryDirectories = do otherModules <- findAvailableModules otherLibraryDirectories - let includeFlags = map (includeFlag ++) otherLibraryDirectories + let includeFlags = (includeFlag ++ buildDirectory) : map (includeFlag ++) otherLibraryDirectories sourceFiles <- getDirectoriesFiles [libraryDirectory] sourceExtensions rawSources <- mapM sourceFileToRawSource sourceFiles let sources = map processRawSource rawSources |