Alexandre Julliard : winebuild: Append the correct options for as and ld when forcing a 32/64-bit build.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0e954b14ebcbff10d86673ef7d5d0549b32400f3
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0e954b14ebcbff10d86673ef7d...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Feb  4 19:33:49 2009 +0100

winebuild: Append the correct options for as and ld when forcing a 32/64-bit build.

---

 tools/winebuild/utils.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
index d9126d8..1828e40 100644
--- a/tools/winebuild/utils.c
+++ b/tools/winebuild/utils.c
@@ -207,6 +207,13 @@ const char *get_as_command(void)
         {
             as_command = xstrdup( "as" );
         }
+
+        if (force_pointer_size)
+        {
+            const char *args = (force_pointer_size == 8) ? " --64" : " --32";
+            as_command = xrealloc( as_command, strlen(as_command) + strlen(args) + 1 );
+            strcat( as_command, args );
+        }
     }
     return as_command;
 }
@@ -225,6 +232,13 @@ const char *get_ld_command(void)
         {
             ld_command = xstrdup( "ld" );
         }
+
+        if (force_pointer_size)
+        {
+            const char *args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386";
+            ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 );
+            strcat( ld_command, args );
+        }
     }
     return ld_command;
 }