diff options
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/__init__.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/linkloc.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 4 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 3b4fcab..375bb81 100644 --- 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 3a96d67..3aa5df8 100644 --- 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 0bb7ba6..313a16b 100644 --- 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 2c8a004..9070784 100644 --- 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 |