This also avoids mixing binaries of multiple WINE installations. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40245 Signed-off-by: Andre Heider <a.heider(a)gmail.com> --- tools/winegcc/Makefile.in | 1 + tools/winegcc/winegcc.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/Makefile.in b/tools/winegcc/Makefile.in index daeb91be1e..d39249d70f 100644 --- a/tools/winegcc/Makefile.in +++ b/tools/winegcc/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ winegcc_EXTRADEFS = \ -DINCLUDEDIR="\"${includedir}\"" \ + -DBINDIR="\"${bindir}\"" \ -DDLLDIR="\"${dlldir}\"" \ -DLIBDIR="\"${libdir}\"" \ -DCC="\"$(CC)\"" \ diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 5136cf3365..87fd661b3f 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -733,7 +733,7 @@ static strarray *get_winebuild_args(struct options *opts) const char* winebuild = getenv("WINEBUILD"); strarray *spec_args = strarray_alloc(); - if (!winebuild) winebuild = "winebuild"; + if (!winebuild) winebuild = BINDIR "/winebuild"; strarray_add( spec_args, winebuild ); if (verbose) strarray_add( spec_args, "-v" ); if (keep_generated) strarray_add( spec_args, "--save-temps" ); -- 2.19.1