Commit 0e0e918f authored by Ken Thomases's avatar Ken Thomases Committed by Alexandre Julliard

winebuild: On Mac OS X, use -arch option to control output of "ld" and "as".

parent 81d1d8e3
...@@ -262,7 +262,9 @@ const char *get_as_command(void) ...@@ -262,7 +262,9 @@ const char *get_as_command(void)
if (force_pointer_size) if (force_pointer_size)
{ {
const char *args = (force_pointer_size == 8) ? " --64" : " --32"; const char *args = (target_platform == PLATFORM_APPLE) ?
((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") :
((force_pointer_size == 8) ? " --64" : " --32");
as_command = xrealloc( as_command, strlen(as_command) + strlen(args) + 1 ); as_command = xrealloc( as_command, strlen(as_command) + strlen(args) + 1 );
strcat( as_command, args ); strcat( as_command, args );
} }
...@@ -288,7 +290,9 @@ const char *get_ld_command(void) ...@@ -288,7 +290,9 @@ const char *get_ld_command(void)
if (force_pointer_size) if (force_pointer_size)
{ {
const char *args = (force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386"; const char *args = (target_platform == PLATFORM_APPLE) ?
((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") :
((force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386");
ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 ); ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 );
strcat( ld_command, args ); strcat( ld_command, args );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment