winegcc: Check also for unsuffixed lib/ dir in get_lib_dir.

Wine uses lib/ and lib64/ by default. This fixes -m32 handling in such configuration. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winegcc: Check also for unsuffixed lib/ dir in get_lib_dir.
551d0971 · Jacek Caban · Alexandre Julliard · 3fcfb9c5 · 551d0971
Commit 551d0971 authored Jul 19, 2018 by Jacek Caban Committed by Alexandre Julliard Jul 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

winegcc.c tools/winegcc/winegcc.c +6 -1

No files found.
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -458,7 +458,12 @@ static char *get_lib_dir( struct options *opts )
        while (p > buffer && p[-1] == '/') p--;
        strcpy( p, libwine );
        if (check_platform( opts, buffer )) goto found;
-        if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2;
+        if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 )))
+        {
+            p -= 2;
+            strcpy( p, libwine );
+            if (check_platform( opts, buffer )) goto found;
+        }
        if (opts->target_cpu != CPU_x86_64 && opts->target_cpu != CPU_ARM64)
        {
            strcpy( p, "32" );