diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-24 16:58:11 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-08-24 16:58:11 -0400 |
| commit | a9e6752bbd888ab8fbc1cda6e4d539b2858c4cef (patch) | |
| tree | 6d5ac4f9e784b91fe4382293eb84684038990dc1 /src/libmain | |
| parent | 4aa1e5c55484ac02d28883292ee5c5806f5e4664 (diff) | |
Include the output name in the GC root link
Output names are now appended to resulting GC symlinks, e.g. by
nix-build. For backwards compatibility, if the output is named "out",
nothing is appended. E.g. doing "nix-build -A foo" on a derivation
that produces outputs "out", "bin" and "dev" will produce symlinks
"./result", "./result-bin" and "./result-dev", respectively.
Diffstat (limited to 'src/libmain')
| -rw-r--r-- | src/libmain/shared.cc | 10 | ||||
| -rw-r--r-- | src/libmain/shared.hh | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index d39816586..026db4173 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -33,16 +33,6 @@ static void sigintHandler(int signo) } -Path makeRootName(const Path & gcRoot, int & counter) -{ - counter++; - if (counter == 1) - return gcRoot; - else - return (format("%1%-%2%") % gcRoot % counter).str(); -} - - void printGCWarning() { static bool haveWarned = false; diff --git a/src/libmain/shared.hh b/src/libmain/shared.hh index 7849e10e3..c69879a12 100644 --- a/src/libmain/shared.hh +++ b/src/libmain/shared.hh @@ -26,7 +26,6 @@ MakeError(UsageError, nix::Error); class StoreAPI; /* Ugh. No better place to put this. */ -Path makeRootName(const Path & gcRoot, int & counter); void printGCWarning(); void printMissing(StoreAPI & store, const PathSet & paths); |