From 204261b63a8cad0629912a9cecfe982b4b78ae44 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 3 Jul 2011 09:06:10 +0200 Subject: [PATCH] AddFilesToContainer: avoid unnecessary work * If after filtering the list of targets is empty, return. * Get the directory only afterwards. --- build/jam/ImageRules | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index ae4ecd6516..1b43a717cb 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -162,8 +162,6 @@ rule AddFilesToContainer container : directoryTokens : targets : destName # AddFilesToContainer : : # [ : dest name ] # - local directory = [ AddDirectoryToContainer $(container) - : $(directoryTokens) ] ; local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ; local systemDirTokens = [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ; @@ -192,6 +190,13 @@ rule AddFilesToContainer container : directoryTokens : targets : destName } } + if ! $(targets) { + return ; + } + + local directory = [ AddDirectoryToContainer $(container) + : $(directoryTokens) ] ; + # We create a unique dummy target per target to install. local installTargetsVar = [ on $(container) return $(HAIKU_INSTALL_TARGETS_VAR) ] ;