diff --git a/new/common.jam b/new/common.jam index 74b619540..2025905bb 100644 --- a/new/common.jam +++ b/new/common.jam @@ -6,6 +6,18 @@ # Provides actions common to all toolsets, for as making directoies and # removing files. +import os ; +import modules ; + +if [ os.name ] = NT +{ + modules.poke : RM : del /f ; +} +else +{ + modules.poek : RM : rm ; +} + rule MkDir { # If dir exists, don't update it @@ -58,7 +70,7 @@ actions MkDir1 actions piecemeal together existing Clean { - rm $(>) + $(RM) $(>) } rule copy diff --git a/new/property.jam b/new/property.jam index 8452cb1c3..307bea63e 100644 --- a/new/property.jam +++ b/new/property.jam @@ -301,8 +301,8 @@ rule translate-paths ( properties * : path ) { if path in [ feature.attributes $(p:G) ] { - local t = [ path.root $(p:G=) $(path) ] ; - result += $(t:G=$(p:G)) ; + local t = [ path.root $(p:TG=) $(path) ] ; + result += $(t:TG=$(p:G)) ; } else { diff --git a/v2/build/property.jam b/v2/build/property.jam index 8452cb1c3..307bea63e 100644 --- a/v2/build/property.jam +++ b/v2/build/property.jam @@ -301,8 +301,8 @@ rule translate-paths ( properties * : path ) { if path in [ feature.attributes $(p:G) ] { - local t = [ path.root $(p:G=) $(path) ] ; - result += $(t:G=$(p:G)) ; + local t = [ path.root $(p:TG=) $(path) ] ; + result += $(t:TG=$(p:G)) ; } else { diff --git a/v2/tools/common.jam b/v2/tools/common.jam index 74b619540..2025905bb 100644 --- a/v2/tools/common.jam +++ b/v2/tools/common.jam @@ -6,6 +6,18 @@ # Provides actions common to all toolsets, for as making directoies and # removing files. +import os ; +import modules ; + +if [ os.name ] = NT +{ + modules.poke : RM : del /f ; +} +else +{ + modules.poek : RM : rm ; +} + rule MkDir { # If dir exists, don't update it @@ -58,7 +70,7 @@ actions MkDir1 actions piecemeal together existing Clean { - rm $(>) + $(RM) $(>) } rule copy