aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>2022-06-13 10:43:14 +0200
committerGitHub <noreply@github.com>2022-06-13 10:43:14 +0200
commit03226aa0532a34d705a5d2d4d792fc000af3dd88 (patch)
tree9b45bb9543d44d144b748bacddc2d626ebfb0280
parent84c4666467b6f5ff4690f2a710e78a59d27f4858 (diff)
parent502d7d9092ccf792a27088f31571dbace96f1962 (diff)
Merge pull request #6651 from ncfavier/nix-build-stop-logger
nix-build: stop logger when appropriate
-rw-r--r--src/nix-build/nix-build.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 426f23905..519855ea3 100644
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -543,6 +543,8 @@ static void main_nix_build(int argc, char * * argv)
restoreProcessContext();
+ logger->stop();
+
execvp(shell->c_str(), argPtrs.data());
throw SysError("executing shell '%s'", *shell);
@@ -601,6 +603,8 @@ static void main_nix_build(int argc, char * * argv)
outPaths.push_back(outputPath);
}
+ logger->stop();
+
for (auto & path : outPaths)
std::cout << store->printStorePath(path) << '\n';
}