summaryrefslogtreecommitdiffstats
path: root/test/long-lines
diff options
context:
space:
mode:
authorDirk Baechle <dl9obn@darc.de>2012-12-18 20:27:01 (GMT)
committerDirk Baechle <dl9obn@darc.de>2012-12-18 20:27:01 (GMT)
commit66e6ceeca3bfa6af0a367bf57dccb8a591e2a82f (patch)
tree572754fc81a9a5239eee054407aa455ca8de5af4 /test/long-lines
parent02cae725ed116ae6cd996fe3bf5888f7f8f61b97 (diff)
downloadSCons-66e6ceeca3bfa6af0a367bf57dccb8a591e2a82f.zip
SCons-66e6ceeca3bfa6af0a367bf57dccb8a591e2a82f.tar.gz
SCons-66e6ceeca3bfa6af0a367bf57dccb8a591e2a82f.tar.bz2
- fixes for MinGW under Windows, mainly skipping MSVS-specific tests
Diffstat (limited to 'test/long-lines')
-rw-r--r--test/long-lines/live.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/long-lines/live.py b/test/long-lines/live.py
index e8b4a38..5618f55 100644
--- a/test/long-lines/live.py
+++ b/test/long-lines/live.py
@@ -42,6 +42,14 @@ if sys.platform == 'win32':
arflag = ' /LIBPATH:' + test.workpath()
linkflag_init = '/LIBPATH:' + test.workpath()
linkflag = ' /LIBPATH:' + test.workpath()
+ import SCons.Tool.MSCommon as msc
+ if not msc.msvc_exists():
+ lib_shared_dll = 'shared.dll'
+ lib_static_lib = 'libstatic.a'
+ arflag_init = 'r'
+ arflag = 'o'
+ linkflag_init = '-L' + test.workpath()
+ linkflag = ' -L' + test.workpath()
elif sys.platform == 'cygwin':
lib_static_lib = 'libstatic.a'
lib_shared_dll ='shared.dll'