Skip to content

Compiler and flags #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 12, 2020
Merged

Compiler and flags #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
339efd6
Change bootstrap command line to be more like the Fortran version
everythingfunctional Oct 27, 2020
55f9d05
Use compiler version and flags to construct build folder name
everythingfunctional Oct 28, 2020
6f7ae5b
Fix Linux/MacOS CI script
everythingfunctional Oct 28, 2020
9dee51c
Fix Windows CI script
everythingfunctional Oct 28, 2020
7b191a7
Add command line options to specify the compiler
everythingfunctional Oct 28, 2020
5d122c2
Add command line options to specify compiler flags
everythingfunctional Oct 28, 2020
2687745
Merge branch 'master' into compiler_and_flags
everythingfunctional Oct 28, 2020
c88cabc
Fix the new_test
everythingfunctional Oct 28, 2020
fa04b1f
Switch test or executable target to option
everythingfunctional Oct 28, 2020
a07bf3f
Change build directory hashes to hex format
everythingfunctional Oct 29, 2020
b38b29f
Add check for if user supplied `--release` and `--flag`.
everythingfunctional Nov 9, 2020
3c6440b
Refactor flag definition for easier support of other compilers
everythingfunctional Nov 9, 2020
ed3f9c6
Fix formatting
everythingfunctional Nov 9, 2020
5ae9d75
Refactor to make supporting more compilers more straightforward
everythingfunctional Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bootstrap/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ dependencies:
- directory
- extra
- filepath
- hashable
- MissingH
- optparse-applicative
- process
Expand Down
41 changes: 24 additions & 17 deletions bootstrap/src/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{-# LANGUAGE MultiWayIf #-}
module Build
( buildLibrary
( CompilerSettings(..)
, buildLibrary
, buildProgram
, buildWithScript
)
Expand Down Expand Up @@ -50,22 +51,28 @@ import System.Directory ( createDirectoryIfMissing
, withCurrentDirectory
)

data CompilerSettings = CompilerSettings {
compilerSettingsCompiler :: FilePath
, compilerSettingsFlags :: [String]
, compilerSettingsModuleFlag :: String
, compilerSettingsIncludeFlag :: String
}

buildProgram
:: FilePath
-> [FilePath]
-> [FilePattern]
-> FilePath
-> FilePath
-> [String]
-> CompilerSettings
-> String
-> FilePath
-> [FilePath]
-> IO ()
buildProgram programDirectory' libraryDirectories sourceExtensions buildDirectory' compiler flags programName programSource archives
buildProgram programDirectory' libraryDirectories sourceExtensions buildDirectory' (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) programName programSource archives
= do
let programDirectory = foldl1 (</>) (splitDirectories programDirectory')
let buildDirectory = foldl1 (</>) (splitDirectories buildDirectory')
let includeFlags = map ("-I" ++) libraryDirectories
let buildDirectory = foldl1 (</>) (splitDirectories buildDirectory')
let includeFlags = map (includeFlag ++) libraryDirectories
sourceFiles <- getDirectoriesFiles [programDirectory] sourceExtensions
rawSources <- mapM sourceFileToRawSource sourceFiles
let sources' = map processRawSource rawSources
Expand Down Expand Up @@ -98,7 +105,7 @@ buildProgram programDirectory' libraryDirectories sourceExtensions buildDirector
in fileMatcher &?> \(objectFile : _) -> do
need (sourceFile : directDependencies)
cmd compiler
["-c", "-J" ++ buildDirectory]
["-c", moduleFlag ++ buildDirectory]
includeFlags
flags
["-o", objectFile, sourceFile]
Expand All @@ -112,14 +119,13 @@ buildLibrary
:: FilePath
-> [FilePattern]
-> FilePath
-> FilePath
-> [String]
-> CompilerSettings
-> String
-> [FilePath]
-> IO (FilePath)
buildLibrary libraryDirectory sourceExtensions buildDirectory compiler flags libraryName otherLibraryDirectories
buildLibrary libraryDirectory sourceExtensions buildDirectory (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) libraryName otherLibraryDirectories
= do
let includeFlags = map ("-I" ++) otherLibraryDirectories
let includeFlags = map (includeFlag ++) otherLibraryDirectories
sourceFiles <- getDirectoriesFiles [libraryDirectory] sourceExtensions
rawSources <- mapM sourceFileToRawSource sourceFiles
let sources = map processRawSource rawSources
Expand Down Expand Up @@ -149,7 +155,7 @@ buildLibrary libraryDirectory sourceExtensions buildDirectory compiler flags lib
in fileMatcher &?> \(objectFile : _) -> do
need (sourceFile : directDependencies)
cmd compiler
["-c", "-J" ++ buildDirectory]
["-c", moduleFlag ++ buildDirectory]
includeFlags
flags
["-o", objectFile, sourceFile]
Expand All @@ -164,18 +170,19 @@ buildWithScript
:: String
-> FilePath
-> FilePath
-> FilePath
-> [String]
-> CompilerSettings
-> String
-> [FilePath]
-> IO (FilePath)
buildWithScript script projectDirectory buildDirectory compiler flags libraryName otherLibraryDirectories
buildWithScript script projectDirectory buildDirectory (CompilerSettings { compilerSettingsCompiler = compiler, compilerSettingsFlags = flags, compilerSettingsModuleFlag = moduleFlag, compilerSettingsIncludeFlag = includeFlag }) libraryName otherLibraryDirectories
= do
absoluteBuildDirectory <- makeAbsolute buildDirectory
createDirectoryIfMissing True absoluteBuildDirectory
absoluteLibraryDirectories <- mapM makeAbsolute otherLibraryDirectories
setEnv "FC" compiler
setEnv "FFLAGS" (intercalate " " flags)
setEnv "FC" compiler
setEnv "FFLAGS" (intercalate " " flags)
setEnv "FINCLUDEFLAG" includeFlag
setEnv "FMODUELFLAG" moduleFlag
setEnv "BUILD_DIR" $ unWindowsPath absoluteBuildDirectory
setEnv "INCLUDE_DIRS"
(intercalate " " (map unWindowsPath absoluteLibraryDirectories))
Expand Down
Loading