[PATCH v2 1/2] winebuild: Refactor find_tool().

[Brendan Shanks]

From: Brendan Shanks

---
 tools/winebuild/utils.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 9f51a60c01f..0f81832bd68 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -243,15 +243,17 @@ struct strarray find_tool( const char *name, const char * const *names )
         names++;
     }

+    if (!file && cc_command.count)
+        file = find_clang_tool( cc_command, name );
+
+    if (!file)
+        file = find_binary( "llvm", name );
+
     if (!file)
     {
-        if (cc_command.count) file = find_clang_tool( cc_command, name );
-        if (!file && !(file = find_binary( "llvm", name )))
-        {
-            struct strarray clang = empty_strarray;
-            strarray_add( &clang, "clang" );
-            file = find_clang_tool( clang, strmake( "llvm-%s", name ));
-        }
+        struct strarray clang = empty_strarray;
+        strarray_add( &clang, "clang" );
+        file = find_clang_tool( clang, strmake( "llvm-%s", name ));
     }
     if (!file) fatal_error( "cannot find the '%s' tool\n", name );