Author: zturner
Date: Mon Nov 19 08:47:06 2018
New Revision: 347224
URL: http://llvm.org/viewvc/llvm-project?rev=347224&view=rev
Log:
[lit] On Windows, don't error if MSVC is not in PATH.
We had some logic backwards, and as a result if MSVC was not found
in PATH we would throw a string concatenation exception.
Modified:
lldb/trunk/lit/helper/toolchain.py
Modified: lldb/trunk/lit/helper/toolchain.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/helper/toolchain.py?rev=347224&r1=347223&r2=347224&view=diff
==============================================================================
--- lldb/trunk/lit/helper/toolchain.py (original)
+++ lldb/trunk/lit/helper/toolchain.py Mon Nov 19 08:47:06 2018
@@ -42,12 +42,14 @@ def _use_msvc_substitutions(config):
# If running from a Visual Studio Command prompt (e.g. vcvars), this will
# detect the include and lib paths, and find cl.exe and link.exe and create
# substitutions for each of them that explicitly specify /I and /L paths
- cl = '"' + lit.util.which('cl') + '"'
- link = '"' + lit.util.which('link') + '"'
+ cl = lit.util.which('cl')
+ link = lit.util.which('link')
if not cl or not link:
return
+ cl = '"' + cl + '"'
+ link = '"' + link + '"'
includes = os.getenv('INCLUDE', '').split(';')
libs = os.getenv('LIB', '').split(';')
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
