[lldb] build.py: fix behavior when passing --compiler=/path/to/compiler

[jgorbe]

Summary

All the other paths in the find_toolchain function return a tuple (detected_toolchain_type, compiler_path), but when the parameter to --compiler is not one of the predefined names it only returns the detected toolchain type, which causes an error when trying to unpack the result.

This patch changes it to return also the compiler path passed as a parameter.

[labath]

Sounds reasonable.

[labath]

BTW, there's some existing tests for build.py in lit/BuildScript. Could you check if it's feasible to make an analogous test for the fix you're making here?

[jgorbe]

Added a new test that checks that, when a full path to a compiler is specified:

• That compiler is used in build commands
• The flag style used in build commands matches the toolchain type autodetected from the compiler executable name

[labath]

Awesome, thanks!

[jgorbe]

Removed trailing blank lines from test case, will commit now. Thanks for the review!

[mgorny]

Is this test supposed to work portably? It fails on NetBSD buildbot: http://lab.llvm.org:8011/builders/netbsd-amd64/builds/20101/steps/run%20unit%20tests/logs/FAIL%3A%20LLDB%3A%3Acompiler-full-path.test

[labath]

In D61713#1502580, @mgorny wrote:

Is this test supposed to work portably? It fails on NetBSD buildbot: http://lab.llvm.org:8011/builders/netbsd-amd64/builds/20101/steps/run%20unit%20tests/logs/FAIL%3A%20LLDB%3A%3Acompiler-full-path.test

I think we can just add --mode=link to the test to avoid it trying to mess with the linker (since that is not important here anyway).

[mgorny]

In D61713#1502606, @labath wrote:

In D61713#1502580, @mgorny wrote:

Is this test supposed to work portably? It fails on NetBSD buildbot: http://lab.llvm.org:8011/builders/netbsd-amd64/builds/20101/steps/run%20unit%20tests/logs/FAIL%3A%20LLDB%3A%3Acompiler-full-path.test

I think we can just add --mode=link to the test to avoid it trying to mess with the linker (since that is not important here anyway).

Did you mean --mode=compile? I can confirm it fixes the test. Should I commit it?

[labath]

In D61713#1502617, @mgorny wrote:

In D61713#1502606, @labath wrote:

In D61713#1502580, @mgorny wrote:

Is this test supposed to work portably? It fails on NetBSD buildbot: http://lab.llvm.org:8011/builders/netbsd-amd64/builds/20101/steps/run%20unit%20tests/logs/FAIL%3A%20LLDB%3A%3Acompiler-full-path.test

I think we can just add --mode=link to the test to avoid it trying to mess with the linker (since that is not important here anyway).

Did you mean --mode=compile? I can confirm it fixes the test. Should I commit it?

Yes, that's what I meant. :) Feel free to commit.

lldb/trunk/lit/BuildScript/compiler-full-path.test

+RUN: %build -n --verbose --arch=64 --compiler=/path/to/my/clang -o foo \
+RUN:    foobar.c | FileCheck %s --check-prefix=CHECK-CLANG
+RUN: %build -n --verbose --arch=64 --compiler=/path/to/my/x64/cl.exe -o foo \
+RUN:    foobar.c | FileCheck %s --check-prefix=CHECK-MSVC
+
+CHECK-CLANG: Command Line: /path/to/my/clang
+CHECK-SAME: -o
+
+CHECK-MSVC: Command Line: /path/to/my/x64/cl.exe
+CHECK-SAME: /Fo

lldb/trunk/lit/helper/build.py

if compiler == 'any':
                 return (type, dir)
         # Could not find any toolchain.
         return (None, None)
 
     # From here on, assume that |compiler| is a path to a file.
     file = os.path.basename(compiler)
     name, ext = os.path.splitext(file)
     if file.lower() == 'cl.exe':
-        return 'msvc'
+        return ('msvc', compiler)
     if name == 'clang-cl':
-        return 'clang-cl'
+        return ('clang-cl', compiler)
     if name.startswith('clang'):
-        return 'clang'
+        return ('clang', compiler)
     if name.startswith('gcc') or name.startswith('g++'):
-        return 'gcc'
+        return ('gcc', compiler)
     if name == 'cc' or name == 'c++':
-        return 'generic'
-    return 'unknown'
+        return ('generic', compiler)
+    return ('unknown', compiler)
 
 class Builder(object):
     def __init__(self, toolchain_type, args, obj_ext):
         self.toolchain_type = toolchain_type
         self.inputs = args.inputs
         self.arch = args.arch
         self.opt = args.opt
         self.outdir = args.outdir