build: support lib.cc #1035
build: support lib.cc #1035
Conversation
|
Please fix CI errors. |
Working on it! I think I know what the issue is, luckily. |
Great, thanks! |
|
Please fix conflicts. (Note: this was merged) |
# Conflicts: # src/BuildConfig.cc # src/Cmd/Build.cc
|
Please fix conflicts, thank you |
…ding # Conflicts: # src/BuildConfig.cc
| BuildConfig::BuildConfig(const std::string& packageName, const bool isDebug) | ||
| : packageName{ packageName }, isDebug{ isDebug } { |
There was a problem hiding this comment.
Now this line looks awkward. Can you also please move this to the constructor body?
| BuildConfig::BuildConfig(const std::string& packageName, const bool isDebug) | |
| : packageName{ packageName }, isDebug{ isDebug } { | |
| BuildConfig::BuildConfig(const std::string& packageName, const bool isDebug) { | |
| packageName = packageName; | |
| isDebug = isDebug; |
There was a problem hiding this comment.
Clang tidy throws an error if I do that.
src/BuildConfig.cc
Outdated
| if (executable) { | ||
| // Project binary target. | ||
| const std::string mainObjTarget = buildOutPath / "main.o"; | ||
| std::unordered_set<std::string> projTargetDeps = { mainObjTarget }; | ||
| collectBinDepObjs( | ||
| projTargetDeps, "", | ||
| targets.at(mainObjTarget).remDeps, // we don't need sourceFile | ||
| buildObjTargets | ||
| ); | ||
|
|
||
| defineLinkTarget(outBasePath / packageName, projTargetDeps); | ||
| } | ||
|
|
||
| defineLinkTarget(outBasePath / packageName, projTargetDeps); | ||
| if (library) { | ||
| // Project library target. | ||
| const std::string libTarget = buildOutPath / "lib.o"; | ||
| std::unordered_set<std::string> libTargetDeps = { libTarget }; | ||
| collectBinDepObjs( | ||
| libTargetDeps, "", | ||
| targets.at(libTarget).remDeps, // we don't need sourceFile | ||
| buildObjTargets | ||
| ); | ||
|
|
||
| defineLibTarget(outBasePath / libName, libTargetDeps); | ||
| } |
There was a problem hiding this comment.
These are almost equivalent. Can you make a new method for this?
There was a problem hiding this comment.
I made new methods but it leaves a few loose ends lying around now. The commands have to be duplicated since I couldn't think of a convenient way to do that. I want to make the command strings both static variables but the library command can't be static since it uses fmt. It might be able to be made static if we use a make variable instead of fmt but I'm not sure how we'd want to go about that. Thoughts?
A simple implementation for static library building. It functions nearly identically to executable building, except that we look for files named
lib.cc(or the other acceptable C++ extensions) and resolved the dependencies for that file. Instead of linking everything into an executable at the end, we instead usearto build an object archive calledlib<package-name>.a.