summaryrefslogtreecommitdiff
path: root/engine/SCons/Script/Main.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 20:22:54 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2014-09-29 20:22:54 +0200
commit665e78e013bc207a5ec35e4bc41daf2e464f6ed3 (patch)
tree811063457777a3e3565d23218321dd35d3435ddc /engine/SCons/Script/Main.py
parent765fbac29295fb4e462c480d09dbdb2f9718a845 (diff)
Imported Upstream version 2.3.4upstream/2.3.4
Diffstat (limited to 'engine/SCons/Script/Main.py')
-rw-r--r--engine/SCons/Script/Main.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/engine/SCons/Script/Main.py b/engine/SCons/Script/Main.py
index f0fcace..d7c9f95 100644
--- a/engine/SCons/Script/Main.py
+++ b/engine/SCons/Script/Main.py
@@ -34,7 +34,7 @@ deprecated_python_version = (2, 7, 0)
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Script/Main.py 2014/08/24 12:12:31 garyo"
+__revision__ = "src/engine/SCons/Script/Main.py 2014/09/27 12:51:43 garyo"
import SCons.compat
@@ -953,6 +953,14 @@ def _main(parser):
if options.include_dir:
sys.path = options.include_dir + sys.path
+ # If we're about to start SCons in the interactive mode,
+ # inform the FS about this right here. Else, the release_target_info
+ # method could get called on some nodes, like the used "gcc" compiler,
+ # when using the Configure methods within the SConscripts.
+ # This would then cause subtle bugs, as already happened in #2971.
+ if options.interactive:
+ SCons.Node.interactive = True
+
# That should cover (most of) the options. Next, set up the variables
# that hold command-line arguments, so the SConscript files that we
# read and execute have access to them.
@@ -1082,7 +1090,6 @@ def _main(parser):
platform = SCons.Platform.platform_module()
if options.interactive:
- SCons.Node.interactive = True
SCons.Script.Interactive.interact(fs, OptionsParser, options,
targets, target_top)