From fe18a855d583fe97e1ac7138e6e79d93d89c814d Mon Sep 17 00:00:00 2001 From: "K. Noel Belcourt" Date: Tue, 11 Mar 2008 17:57:54 +0000 Subject: [PATCH] A user-config.jam that defined multiple python toolsets exposed an error in the python.jam init rule. Moved the feature definition out of the init rule to avoid the feature redefinition error. [SVN r43566] --- src/tools/python.jam | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/tools/python.jam b/src/tools/python.jam index 5613e6732..91cf242f1 100644 --- a/src/tools/python.jam +++ b/src/tools/python.jam @@ -55,6 +55,11 @@ lib pthread ; # Extra library needed by phtread on some platforms. lib rt ; +# The pythonpath feature specifies additional elements for the PYTHONPATH +# environment variable, set by run-pyd. For example, pythonpath can be used +# to access Python modules that are part of the product being built, but +# are not installed in the development system's default paths. +feature.feature pythonpath : : free optional path ; # Initializes the Python toolset. Note that all parameters are # optional. @@ -111,12 +116,6 @@ rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; - # The pythonpath feature specifies additional elements for the PYTHONPATH - # environment variable, set by run-pyd. For example, pythonpath can be used - # to access Python modules that are part of the product being built, but - # are not installed in the development system's default paths. - feature.feature pythonpath : : free optional path ; - project.pop-current ; }