From 0e0e918f0f60ebe3e0f6f11b44473853c625ba33 Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Fri, 1 May 2009 22:59:36 -0500 Subject: [PATCH] winebuild: On Mac OS X, use -arch option to control output of "ld" and "as". --- tools/winebuild/utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 400f01aeb21..d6eab0e22fc 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -262,7 +262,9 @@ const char *get_as_command(void) 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 ); strcat( as_command, args ); } @@ -288,7 +290,9 @@ const char *get_ld_command(void) 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 ); strcat( ld_command, args ); } -- 2.11.4.GIT