From e388fd0f84bf1f6fe08f1ad641fc0b1547cccdb3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 5 Mar 2002 22:43:26 +0000 Subject: [PATCH] Sstage targets where not using the complete local-build arguments [SVN r13103] --- boost-base.jam | 8 ++------ v1/boost-base.jam | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/boost-base.jam b/boost-base.jam index 8043bb1be..f31fcc067 100644 --- a/boost-base.jam +++ b/boost-base.jam @@ -1851,15 +1851,11 @@ rule stage ( name : sources + : requirements * : local-build * ) { local stage-id = [ grist-targets $(name) ] ; - local stage-local-build = - [ select-gristed $(local-build) ] ; - local source-local-build = - [ select-ungristed $(local-build) ] ; local tags = [ get-properties : $(requirements) ] ; # Supress the regular build of this target - local gSUPPRESS_FAKE_TARGETS = [ get-values : $(stage-local-build) ] ; + local gSUPPRESS_FAKE_TARGETS = [ get-values : $(local-build) ] ; local stage-dir = $(name:G=) ; local files = [ select-ungristed $(sources) ] ; @@ -1877,7 +1873,7 @@ rule stage ( name : sources + : requirements * : local-build * ) local target-id = [ FGristFiles $(target) ] ; local BUILD = ; - local subvariants = [ expand-target-subvariants $(target-id) : $(source-local-build) : $(TOOLS) : BUILD ] ; + local subvariants = [ expand-target-subvariants $(target-id) : $(local-build) : $(TOOLS) : BUILD ] ; dependent-include $(target) ; diff --git a/v1/boost-base.jam b/v1/boost-base.jam index 8043bb1be..f31fcc067 100644 --- a/v1/boost-base.jam +++ b/v1/boost-base.jam @@ -1851,15 +1851,11 @@ rule stage ( name : sources + : requirements * : local-build * ) { local stage-id = [ grist-targets $(name) ] ; - local stage-local-build = - [ select-gristed $(local-build) ] ; - local source-local-build = - [ select-ungristed $(local-build) ] ; local tags = [ get-properties : $(requirements) ] ; # Supress the regular build of this target - local gSUPPRESS_FAKE_TARGETS = [ get-values : $(stage-local-build) ] ; + local gSUPPRESS_FAKE_TARGETS = [ get-values : $(local-build) ] ; local stage-dir = $(name:G=) ; local files = [ select-ungristed $(sources) ] ; @@ -1877,7 +1873,7 @@ rule stage ( name : sources + : requirements * : local-build * ) local target-id = [ FGristFiles $(target) ] ; local BUILD = ; - local subvariants = [ expand-target-subvariants $(target-id) : $(source-local-build) : $(TOOLS) : BUILD ] ; + local subvariants = [ expand-target-subvariants $(target-id) : $(local-build) : $(TOOLS) : BUILD ] ; dependent-include $(target) ;