Kevin Puetz : winegcc: --out-implib needs to propagate -m32/-m64 to winebuild.
Alexandre Julliard
julliard at winehq.org
Fri Feb 4 16:08:34 CST 2022
Module: wine
Branch: master
Commit: ccf7b4459bc6a8303aa93a9743e7a3b01ffb9783
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccf7b4459bc6a8303aa93a9743e7a3b01ffb9783
Author: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Date: Thu Feb 3 16:08:25 2022 -0600
winegcc: --out-implib needs to propagate -m32/-m64 to winebuild.
This was already passed through for linking, and for spec.o files,
but was overlooked when implementing -Wl,--out-implib
Signed-off-by: Kevin Puetz <PuetzKevinA at JohnDeere.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/winegcc/winegcc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 8644afe7535..2eb0bdbcf3b 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -888,6 +888,8 @@ static struct strarray get_winebuild_args(struct options *opts)
strarray_add( &spec_args, "--target" );
strarray_add( &spec_args, opts->target_alias );
}
+ if (opts->force_pointer_size)
+ strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
for (i = 0; i < opts->prefix.count; i++)
strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] ));
strarray_addall( &spec_args, opts->winebuild_args );
@@ -1016,8 +1018,6 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file,
}
spec_o_name = get_temp_file(output_name, ".spec.o");
- if (opts->force_pointer_size)
- strarray_add(&spec_args, strmake("-m%u", 8 * opts->force_pointer_size ));
if (opts->pic && !is_pe) strarray_add(&spec_args, "-fPIC");
strarray_add(&spec_args, opts->shared ? "--dll" : "--exe");
if (opts->fake_module)
More information about the wine-cvs
mailing list