Fix tool problems with xilink and linkloc.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@771 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3b4fcab6f83f5759f6cad84d95a4474ff985eb3c..375bb81fea440d3aaad7e03e3eb7a96a301554dd 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,7 +10,9 @@
 
 RELEASE X.XX - XXX, XX XXX XXXX XX:XX:XX XXXXX
 
-  From Steven Knight
+  From Charles Crain and Gary Oberbrunner:
+
+  - Fix Tool import problems with the Intel and PharLap linkers.
 
   From Gerard Patel
 

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index 3a96d67f2574f0ad049ddc1086c5ecd461f11ae4..3aa5df89a37b2cfafee45c7243618a45c3adff64 100644 (file)
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -230,7 +230,7 @@ def tool_list(platform, env):
     # change these search orders, update the man page as well.
     if str(platform) == 'win32':
         "prefer Microsoft tools on Windows"
-        linkers = ['mslink', 'gnulink', 'xilink', 'ilink', 'linkloc' ]
+        linkers = ['mslink', 'gnulink', 'ilink', 'linkloc' ]
         c_compilers = ['msvc', 'mingw', 'gcc', 'icl', 'icc' ]
         assemblers = ['masm', 'nasm', 'gas', '386asm' ]
         fortran_compilers = ['g77', 'ifl']

diff --git a/src/engine/SCons/Tool/linkloc.py b/src/engine/SCons/Tool/linkloc.py
index 0bb7ba6141f0172b63a94a3e6aa6b6de9983d42d..313a16bf29527c1f6265aa6415bfb93acf24c145 100644 (file)
--- a/src/engine/SCons/Tool/linkloc.py
+++ b/src/engine/SCons/Tool/linkloc.py
@@ -44,7 +44,7 @@ import SCons.Errors
 import SCons.Tool
 import SCons.Util
 
-from SCons.Tool.msvc import get_msdev_paths
+from SCons.Tool.msvc import get_msvc_paths
 from SCons.Tool.PharLapCommon import addPharLapPaths
 
 _re_linker_command = re.compile(r'(\s)@\s*([^\s]+)')
@@ -95,7 +95,7 @@ def generate(env):
     env['LIBLINKPREFIX']='-lib '
     env['LIBLINKSUFFIX']='$LIBSUFFIX'
 
-    include_path, lib_path, exe_path = get_msdev_paths()
+    include_path, lib_path, exe_path = get_msvc_paths()
     env['ENV']['LIB']            = lib_path
     env['ENV']['PATH']           = exe_path
 

diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py
index 2c8a004f1dee8d4982ff36ad0bf2355f9269ea57..907078454ae0ef0b65fcb124f8edab3cda78c747 100644 (file)
--- a/src/engine/SCons/Tool/msvc.py
+++ b/src/engine/SCons/Tool/msvc.py
@@ -266,7 +266,7 @@ def get_msvc_paths(version=None):
             
     try:
         if not version:
-            version = get_visualstudio_versions()[0] #use highest version
+            version = SCons.Tool.msvs.get_visualstudio_versions()[0] #use highest version
 
         include_path = get_msvc_path("include", version)
         lib_path = get_msvc_path("lib", version)
@@ -300,7 +300,7 @@ def get_msvc_default_paths(version = None):
 
     try:
         if not version:
-            version = get_visualstudio_versions()[0] #use highest version
+            version = SCons.Tool.msvs.get_visualstudio_versions()[0] #use highest version
     except:
         pass