From f459a5bb3a7142dee5d82c5d385bc3c4654c8e2c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Nov 2006 18:19:05 +0000 Subject: [PATCH] * Remove the undocumented `noscan' feature. It's no longer necessary now that reference scanning is sufficiently streamy. --- src/libstore/build.cc | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 82f713c8c..7058bd12b 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1479,21 +1479,18 @@ void DerivationGoal::computeClosure() /* For this output path, find the references to other paths contained in it. */ - PathSet references; - if (!pathExists(path + "/nix-support/no-scan")) { - references = scanForReferences(path, allPaths); + PathSet references = scanForReferences(path, allPaths); - /* For debugging, print out the referenced and - unreferenced paths. */ - for (PathSet::iterator i = inputPaths.begin(); - i != inputPaths.end(); ++i) - { - PathSet::iterator j = references.find(*i); - if (j == references.end()) - debug(format("unreferenced input: `%1%'") % *i); - else - debug(format("referenced input: `%1%'") % *i); - } + /* For debugging, print out the referenced and unreferenced + paths. */ + for (PathSet::iterator i = inputPaths.begin(); + i != inputPaths.end(); ++i) + { + PathSet::iterator j = references.find(*i); + if (j == references.end()) + debug(format("unreferenced input: `%1%'") % *i); + else + debug(format("referenced input: `%1%'") % *i); } allReferences[path] = references;