From 98b9ca9a3abd8c5c5fae9ff92331b63ba4cedd87 Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Thu, 17 Dec 2015 09:31:03 -0500
Subject: fix swig test failing on windows due to  \r\n line endings

---
 src/engine/SCons/Tool/swig.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/engine/SCons/Tool/swig.py b/src/engine/SCons/Tool/swig.py
index 309585d..ce54e62 100644
--- a/src/engine/SCons/Tool/swig.py
+++ b/src/engine/SCons/Tool/swig.py
@@ -139,9 +139,13 @@ def _get_swig_version(env, swig):
     if pipe.wait() != 0: return
 
     out = pipe.stdout.read()
-    match = re.search(r'SWIG Version\s+(\S+)$', out, re.MULTILINE)
+    match = re.search(r'SWIG Version\s+(\S+).*', out, re.MULTILINE)
     if match:
+        # print "Version is:%s"%match.group(1)
         return match.group(1)
+    else:
+        # print "Unable to detect version: [%s]"%out
+        pass
 
 def generate(env):
     """Add Builders and construction variables for swig to an Environment."""
-- 
cgit v0.12