diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 16:55:05 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 16:55:05 +0200 |
| commit | d240a76169c685e488fe7352adec69d39c60ef9f (patch) | |
| tree | 144aeb4702d258b0cfaf99cffb9f21e94b026459 /src/engine/SCons/Tool/mslib.py | |
| parent | 6ca68f29862bc7cbe5428426eee600cb1f3c05c1 (diff) | |
| parent | c2d9eaeffe9d77d8d5087fb21a3256fde32047d4 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/engine/SCons/Tool/mslib.py')
| -rw-r--r-- | src/engine/SCons/Tool/mslib.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/mslib.py b/src/engine/SCons/Tool/mslib.py index 00a17d7..cecdbdc 100644 --- a/src/engine/SCons/Tool/mslib.py +++ b/src/engine/SCons/Tool/mslib.py @@ -31,7 +31,9 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/mslib.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mslib.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" + +import os import SCons.Defaults import SCons.Tool @@ -54,6 +56,13 @@ def generate(env): env['LIBPREFIX'] = '' env['LIBSUFFIX'] = '.lib' + # Issue #3350 + # Change tempfile argument joining character from a space to a newline + # mslink will fail if any single line is too long, but is fine with many lines + # in a tempfile + env['TEMPFILEARGJOIN'] = os.linesep + + def exists(env): return msvc_exists(env) |