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

diff --git a/src/engine/SCons/Tool/MSCommon/vc2.py b/src/engine/SCons/Tool/MSCommon/vc2.py
index 789676bc06b68bed3df5004459ef3035f7ad6f00..3323daf3a74c9f49a037059c121ea6953d7b6971 100644 (file)
--- 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 1b71e53f9391dc264791a2ebf078b2b03f4a2f69..507e74096a723c3dc72b53424f58150e61945988 100644 (file)
--- 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'