From 64d728b8da837fe9cd495b109c7aaeb18307f1d8 Mon Sep 17 00:00:00 2001 From: cournape Date: Thu, 19 Nov 2009 04:58:46 +0000 Subject: [PATCH] BUG: do not set up the SDK for now - it messes up cross compilation. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4444 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/Tool/MSCommon/vc2.py | 2 +- src/engine/SCons/Tool/msvc.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/engine/SCons/Tool/MSCommon/vc2.py b/src/engine/SCons/Tool/MSCommon/vc2.py index 789676bc..3323daf3 100644 --- a/src/engine/SCons/Tool/MSCommon/vc2.py +++ b/src/engine/SCons/Tool/MSCommon/vc2.py @@ -211,7 +211,7 @@ def msvc_setup_env_once(env): if not has_run: msvc_setup_env(env) - env["MSVC_SETUP_RUN"] = False + env["MSVC_SETUP_RUN"] = True def msvc_exists(version=None): vcs = get_installed_vcs() diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index 1b71e53f..507e7409 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -235,9 +235,6 @@ def generate(env): # Set-up ms tools paths msvc_setup_env_once(env) - import mssdk - mssdk.generate(env) - env['CFILESUFFIX'] = '.c' env['CXXFILESUFFIX'] = '.cc' -- 2.26.2