diff options
| author | Steven Knight <knight@baldmt.com> | 2009-01-18 19:33:53 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-01-18 19:33:53 (GMT) |
| commit | 6d699199b32405f27c8e76b5164bdc57fcd69602 (patch) | |
| tree | 05c369c0cf64c9d7514b08db774ba6512cc587ca /src/engine/SCons/Tool/link.py | |
| parent | 79a086c22c6964a04ab88a382aaba3626c216b5a (diff) | |
| download | SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.zip SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.tar.gz SCons-6d699199b32405f27c8e76b5164bdc57fcd69602.tar.bz2 | |
Various Windows fixes:
* Restore correct code to detect a bad drive on Windows.
* Update the bad drive error message to include the target name.
* Update SConfTests.py to print the config.log on error.
* Fix the smart_link() error message to not use repr() of a path so
escaping the \ separators on Windows doesn't interfere with regex matchs.
* Update regexes in test/VariantDir/reflect.py to accomodate command-line
re-ordering to put the /OUT: first in the line.
* Explicitly check for smart_link() messages even on Windows.
Diffstat (limited to 'src/engine/SCons/Tool/link.py')
| -rw-r--r-- | src/engine/SCons/Tool/link.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py index b11be76..d0fe86c 100644 --- a/src/engine/SCons/Tool/link.py +++ b/src/engine/SCons/Tool/link.py @@ -51,10 +51,10 @@ def smart_link(source, target, env, for_signature): global issued_mixed_link_warning if not issued_mixed_link_warning: msg = "Using $CXX to link Fortran and C++ code together.\n\t" + \ - "This may generate a buggy executable if the %s\n\t" + \ + "This may generate a buggy executable if the '%s'\n\t" + \ "compiler does not know how to deal with Fortran runtimes." SCons.Warnings.warn(SCons.Warnings.FortranCxxMixWarning, - msg % repr(env.subst('$CXX'))) + msg % env.subst('$CXX')) issued_mixed_link_warning = True return '$CXX' elif has_fortran: |