diff options
author | dec05eba <dec05eba@protonmail.com> | 2017-12-16 18:23:00 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2017-12-16 18:23:41 +0100 |
commit | 33872fc72e40331c23a82f2b5ec3e509c7191d7a (patch) | |
tree | a6f210b7d264f82a5f2f674291c97d88f5714213 /src/GlobalLib.cpp | |
parent | 9487a0e924a10a1c314cb51afb5f65ced437b1d3 (diff) |
Modify ninja interface to build after creating build file
This setup is needed because we need to build the project
before building tests
Diffstat (limited to 'src/GlobalLib.cpp')
-rw-r--r-- | src/GlobalLib.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp index c38e22f..30a044f 100644 --- a/src/GlobalLib.cpp +++ b/src/GlobalLib.cpp @@ -203,14 +203,10 @@ namespace sibs if(createBuildDirResult.isErr()) return Result<string>::Err(createBuildDirResult); - Result<bool> buildFileResult = ninja.createBuildFile(sibsConfig, debugBuildPath.c_str(), staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc); + Result<bool> buildFileResult = ninja.build(sibsConfig, debugBuildPath.c_str(), staticLinkerFlagCallbackFunc, dynamicLinkerFlagCallbackFunc); if (buildFileResult.isErr()) return Result<string>::Err(buildFileResult.getErrMsg()); - Result<bool> buildResult = ninja.build(debugBuildPath.c_str()); - if (buildResult.isErr()) - return Result<string>::Err(buildResult.getErrMsg()); - return Result<string>::Ok(libPath); } } |