diff options
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ifort.py | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 97a4bcd..39c0c8a 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -359,6 +359,10 @@ RELEASE 0.97 - XXX - In Visual Studio project files, put quotes around the -C directory so everything works even if the path has spaces in it. + - The Intel Fortran compiler uses -object:$TARGET, not "-o $TARGET", + when building object files on Windows. Have the the ifort Tool + modify the default command lines appropriately. + From Chen Lee: - Handle Visual Studio project and solution files in Unicode. diff --git a/src/engine/SCons/Tool/ifort.py b/src/engine/SCons/Tool/ifort.py index 181078a..7681f38 100644 --- a/src/engine/SCons/Tool/ifort.py +++ b/src/engine/SCons/Tool/ifort.py @@ -34,6 +34,8 @@ selection method. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import string + import SCons.Defaults import fortran @@ -58,5 +60,14 @@ def generate(env): # be in shared libraries. env['SHLINKFLAGS'] = '-shared -no_archive' + # + if env['PLATFORM'] == 'win32': + # On Windows, the ifort compiler specifies the object on the + # command line with -object:, not -o. Massage the necessary + # command-line construction variables. + for var in ['_FORTRANCOMD', '_FORTRANPPCOMD', + '_SHFORTRANCOMD', '_SHFORTRANPPCOMD']: + env[var] = string.replace(env[var], '-o $TARGET', '-object:$TARGET') + def exists(env): return env.Detect('ifort') |