summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2021-11-06 11:03:12 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2021-11-06 11:03:12 +0100
commit92cc25c10bcba1f14cbf28bd0298311b8e81a2ea (patch)
tree1d35fd2cd31f7ef3718b46244a4305b44c295ec1
parent1689e28435021f9bd12d92d167113338eb230057 (diff)
Fix rebuilding after adding or removing of ctor.cc files to the build configuration using -a/-r commandline args..
-rw-r--r--src/configure.cc2
-rw-r--r--src/libctor.cc2
-rw-r--r--src/rebuild.cc2
-rw-r--r--src/rebuild.h2
-rw-r--r--src/task_ar.cc7
-rw-r--r--src/task_ld.cc7
-rw-r--r--src/task_so.cc7
7 files changed, 25 insertions, 4 deletions
diff --git a/src/configure.cc b/src/configure.cc
index 675699d..9ebed8a 100644
--- a/src/configure.cc
+++ b/src/configure.cc
@@ -351,7 +351,7 @@ int configure(const Settings& global_settings, int argc, char* argv[])
istr << "//#define HAS_BAR 1\n";
}
- recompileCheck(settings, 1, argv, true, false);
+ recompileCheck(settings, 1, argv, false);
return 0;
}
diff --git a/src/libctor.cc b/src/libctor.cc
index 84a5fae..c752192 100644
--- a/src/libctor.cc
+++ b/src/libctor.cc
@@ -209,7 +209,7 @@ Options:
}
// Force rebuild if files were added
- recompileCheck(settings, 1, argv, true, no_relaunch == false);
+ recompileCheck(settings, 1, argv, no_relaunch == false);
}
recompileCheck(settings, argc, argv);
diff --git a/src/rebuild.cc b/src/rebuild.cc
index af2bd8a..a03f5e3 100644
--- a/src/rebuild.cc
+++ b/src/rebuild.cc
@@ -114,7 +114,7 @@ bool contains(const std::vector<Source>& sources, const std::string& file)
}
void recompileCheck(const Settings& global_settings, int argc, char* argv[],
- bool force, bool relaunch_allowed)
+ bool relaunch_allowed)
{
using namespace std::string_literals;
diff --git a/src/rebuild.h b/src/rebuild.h
index ae3e408..020df6b 100644
--- a/src/rebuild.h
+++ b/src/rebuild.h
@@ -32,4 +32,4 @@ extern std::size_t numExternalConfigFiles;
int unreg(const char* location);
void recompileCheck(const Settings& settings, int argc, char* argv[],
- bool force = false, bool relaunch_allowed = true);
+ bool relaunch_allowed = true);
diff --git a/src/task_ar.cc b/src/task_ar.cc
index 9658953..0bcad0c 100644
--- a/src/task_ar.cc
+++ b/src/task_ar.cc
@@ -197,5 +197,12 @@ std::string TaskAR::flagsString() const
flagsStr += dep;
}
+ auto deps = depends();
+ for(const auto& dep : deps)
+ {
+ flagsStr += " ";
+ flagsStr += dep;
+ }
+
return flagsStr;
}
diff --git a/src/task_ld.cc b/src/task_ld.cc
index 52aae04..2a3c8c4 100644
--- a/src/task_ld.cc
+++ b/src/task_ld.cc
@@ -225,5 +225,12 @@ std::string TaskLD::flagsString() const
flagsStr += dep;
}
+ auto deps = depends();
+ for(const auto& dep : deps)
+ {
+ flagsStr += " ";
+ flagsStr += dep;
+ }
+
return flagsStr;
}
diff --git a/src/task_so.cc b/src/task_so.cc
index 96fa1a3..5aa5723 100644
--- a/src/task_so.cc
+++ b/src/task_so.cc
@@ -198,5 +198,12 @@ std::string TaskSO::flagsString() const
flagsStr += dep;
}
+ auto deps = depends();
+ for(const auto& dep : deps)
+ {
+ flagsStr += " ";
+ flagsStr += dep;
+ }
+
return flagsStr;
}