winebuild: Use gcc to assemble if clang not found

André Hentschel nerv at dawncrow.de
Sat Jun 8 13:24:37 CDT 2013


likewise to how clang is handled right now
---
 tools/winebuild/utils.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 1c77e41..005a6ea 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -348,13 +348,14 @@ char *find_tool( const char *name, const char * const *names )
 
 struct strarray *get_as_command(void)
 {
-    static int as_is_clang = 0;
+    static int as_is_cc = 0;
     struct strarray *args = strarray_init();
 
     if (!as_command)
     {
-        as_command = find_tool( "clang", NULL );
-        if (as_command) as_is_clang = 1;
+        static const char * const commands[] = { "gcc", "cc", NULL };
+        as_command = find_tool( "clang", commands );
+        if (as_command) as_is_cc = 1;
     }
 
     if (!as_command)
@@ -368,7 +369,7 @@ struct strarray *get_as_command(void)
 
     strarray_add_one( args, as_command );
 
-    if (as_is_clang)
+    if (as_is_cc)
     {
         strarray_add( args, "-xassembler", "-c", NULL );
         if (force_pointer_size)
-- 
1.8.1.2



More information about the wine-patches mailing list