summaryrefslogtreecommitdiff
path: root/task_cc.cc
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2021-06-19 14:33:34 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2021-06-19 14:33:34 +0200
commit1585cf0bab4fc20dd999b40da3a91d298dcbcdb8 (patch)
tree9e2e38ae89e061b374e182628f2b7fc671bac8c0 /task_cc.cc
parent154ce9b1ce22532a68f95f2291fa12fd90c49fde (diff)
Make include paths work relative to the build config files.
Diffstat (limited to 'task_cc.cc')
-rw-r--r--task_cc.cc23
1 files changed, 21 insertions, 2 deletions
diff --git a/task_cc.cc b/task_cc.cc
index f827c25..b5cc768 100644
--- a/task_cc.cc
+++ b/task_cc.cc
@@ -88,6 +88,7 @@ TaskCC::TaskCC(const BuildConfiguration& config, const Settings& settings,
: Task({})
, config(config)
, settings(settings)
+ , sourceDir(sourceDir)
{
sourceFile = sourceDir;
sourceFile /= source;
@@ -193,6 +194,23 @@ int TaskCC::runInner()
for(const auto& flag : compiler_flags)
{
+ // Is arg an added include path?
+ if(flag.substr(0, 2) == "-I")
+ {
+ std::string include_path = flag.substr(2);
+ include_path.erase(0, include_path.find_first_not_of(' '));
+ std::filesystem::path path(include_path);
+
+ // Is it relative?
+ if(path.is_relative())
+ {
+ path = (sourceDir / path).lexically_normal();
+ std::string new_include_path = "-I" + path.string();
+ args.push_back(new_include_path);
+ continue;
+ }
+ }
+
args.push_back(flag);
}
@@ -203,8 +221,9 @@ int TaskCC::runInner()
if(settings.verbose == 0)
{
- std::cout << compiler() << " " << sourceFile.string() << " => " <<
- targetFile.string() << "\n";
+ std::cout << compiler() << " " <<
+ sourceFile.lexically_normal().string() << " => " <<
+ targetFile.lexically_normal().string() << "\n";
}
return execute(comp, args, settings.verbose > 0);
}