Alexandre Julliard : winebuild: Update target-dependent characteristics after option parsing.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bc2e4ea7e24de5ccd2909b0db6199e8cfd52bbc2
URL:    https://gitlab.winehq.org/wine/wine/-/commit/bc2e4ea7e24de5ccd2909b0db6199e8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Jun  9 11:05:51 2023 +0200

winebuild: Update target-dependent characteristics after option parsing.

---

 tools/winebuild/main.c  | 5 +++++
 tools/winebuild/utils.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c
index f216e4bf35d..c5f5b56c20e 100644
--- a/tools/winebuild/main.c
+++ b/tools/winebuild/main.c
@@ -640,6 +640,11 @@ int main(int argc, char **argv)
             spec->characteristics |= IMAGE_FILE_DLL;
         /* fall through */
     case MODE_EXE:
+        if (get_ptr_size() == 4)
+            spec->characteristics |= IMAGE_FILE_32BIT_MACHINE;
+        else
+            spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
+
         files = load_resources( files, spec );
         if (spec_file_name && !parse_input_file( spec )) break;
         if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point( spec ));
diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index 523f1af7118..49d2468b236 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -629,10 +629,6 @@ DLLSPEC *alloc_dll_spec(void)
     spec->subsystem_major    = 4;
     spec->subsystem_minor    = 0;
     spec->syscall_table      = 0;
-    if (get_ptr_size() > 4)
-        spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE;
-    else
-        spec->characteristics |= IMAGE_FILE_32BIT_MACHINE;
     spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT;
     return spec;
 }