Skip to content
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

Set Make's default CXX #1002

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Set Make's default CXX #1002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 32 additions & 13 deletions src/BuildConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "BuildConfig.hpp"

#include "Algos.hpp"
#include "Command.hpp"
#include "Exception.hpp"
#include "Git2.hpp"
#include "Logger.hpp"
Expand Down Expand Up @@ -109,15 +110,36 @@ struct BuildConfig {
std::optional<std::unordered_set<std::string>> all;

std::string OUT_DIR;
std::string CXX = "clang++";
std::string CXX;
std::vector<std::string> CXXFLAGS;
std::vector<std::string> DEFINES;
std::vector<std::string> INCLUDES = { "-I../../include" };
std::vector<std::string> LIBS;

BuildConfig() = default;
explicit BuildConfig(const std::string& packageName)
: packageName{ packageName }, buildOutDir{ packageName + ".d" } {}
: packageName{ packageName }, buildOutDir{ packageName + ".d" } {
if (const char* cxx = std::getenv("CXX")) {
CXX = cxx;
} else {
std::string output = Command("make")
.addArg("--print-data-base")
.addArg("--question")
.addArg("-f")
.addArg("/dev/null")
.output()
.output;
std::istringstream iss(output);
std::string line;

while (std::getline(iss, line)) {
if (line.starts_with("CXX = ")) {
CXX = line.substr(6);
return;
}
}
throw PoacError("failed to get CXX from make");
}
}

void setOutDir(const bool isDebug) {
if (isDebug) {
Expand Down Expand Up @@ -593,7 +615,7 @@ BuildConfig::addDefine(

void
BuildConfig::setVariables(const bool isDebug) {
this->defineCondVar("CXX", CXX);
this->defineSimpleVar("CXX", CXX);

CXXFLAGS.push_back("-std=c++" + getPackageEdition().getString());
if (shouldColor()) {
Expand Down Expand Up @@ -816,9 +838,6 @@ configureBuild(BuildConfig& config, const bool isDebug) {
if (!fs::exists(outDir)) {
fs::create_directories(outDir);
}
if (const char* cxx = std::getenv("CXX")) {
config.CXX = cxx;
}

config.setVariables(isDebug);

Expand Down Expand Up @@ -999,7 +1018,7 @@ namespace tests {

void
testCycleVars() {
BuildConfig config;
BuildConfig config("test");
config.defineSimpleVar("a", "b", { "b" });
config.defineSimpleVar("b", "c", { "c" });
config.defineSimpleVar("c", "a", { "a" });
Expand All @@ -1017,7 +1036,7 @@ testCycleVars() {

void
testSimpleVars() {
BuildConfig config;
BuildConfig config("test");
config.defineSimpleVar("c", "3", { "b" });
config.defineSimpleVar("b", "2", { "a" });
config.defineSimpleVar("a", "1");
Expand All @@ -1036,7 +1055,7 @@ testSimpleVars() {

void
testDependOnUnregisteredVar() {
BuildConfig config;
BuildConfig config("test");
config.defineSimpleVar("a", "1", { "b" });

std::ostringstream oss;
Expand All @@ -1049,7 +1068,7 @@ testDependOnUnregisteredVar() {

void
testCycleTargets() {
BuildConfig config;
BuildConfig config("test");
config.defineTarget("a", { "echo a" }, { "b" });
config.defineTarget("b", { "echo b" }, { "c" });
config.defineTarget("c", { "echo c" }, { "a" });
Expand All @@ -1067,7 +1086,7 @@ testCycleTargets() {

void
testSimpleTargets() {
BuildConfig config;
BuildConfig config("test");
config.defineTarget("a", { "echo a" });
config.defineTarget("b", { "echo b" }, { "a" });
config.defineTarget("c", { "echo c" }, { "b" });
Expand All @@ -1092,7 +1111,7 @@ testSimpleTargets() {

void
testDependOnUnregisteredTarget() {
BuildConfig config;
BuildConfig config("test");
config.defineTarget("a", { "echo a" }, { "b" });

std::ostringstream oss;
Expand Down
Loading