Alexandre Julliard : winegcc: Make the WINEBUILD variable take precedence over the bin directory.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d96a0acf296d45538cb8c95e965e06f173039fe5
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d96a0acf296d45538cb8c95e9...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Feb  6 21:12:25 2020 +0100

winegcc: Make the WINEBUILD variable take precedence over the bin directory.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 tools/winegcc/winegcc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index c6bd444fa3..bee81edcc3 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -865,10 +865,12 @@ static strarray *get_winebuild_args(struct options *opts)
         binary = opts->winebuild;
     else if (opts->wine_objdir)
         binary = strmake( "%s/tools/winebuild/winebuild%s", opts->wine_objdir, EXEEXT );
+    else if (winebuild)
+        binary = find_binary( opts->prefix, winebuild );
     else if (bindir)
         binary = strmake( "%s/winebuild%s", bindir, EXEEXT );
     else
-        binary = find_binary( opts->prefix, winebuild ? winebuild : "winebuild" );
+        binary = find_binary( opts->prefix, "winebuild" );
     strarray_add( spec_args, binary );
     if (verbose) strarray_add( spec_args, "-v" );
     if (keep_generated) strarray_add( spec_args, "--save-temps" );