SOURCES: wine-notarget.patch (NEW) we don't have target-as binary, use pure...

arekm arekm at pld-linux.org
Wed Feb 25 15:04:30 CET 2009


Author: arekm                        Date: Wed Feb 25 14:04:30 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
we don't have target-as binary, use pure 'as', same for nm and ld

---- Files affected:
SOURCES:
   wine-notarget.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/wine-notarget.patch
diff -u /dev/null SOURCES/wine-notarget.patch:1.1
--- /dev/null	Wed Feb 25 15:04:31 2009
+++ SOURCES/wine-notarget.patch	Wed Feb 25 15:04:25 2009
@@ -0,0 +1,58 @@
+--- wine-1.1.15/tools/winegcc/winegcc.c~	2009-02-13 18:01:33.000000000 +0100
++++ wine-1.1.15/tools/winegcc/winegcc.c	2009-02-25 14:37:44.743493303 +0100
+@@ -302,8 +302,7 @@
+         else str = CXX;
+         break;
+     case proc_as:
+-        if (opts->target) str = strmake( "%s-as", opts->target );
+-        else str = AS;
++        str = AS;
+         break;
+     default:
+         assert(0);
+--- wine-1.1.15/tools/winebuild/utils.c~	2009-02-13 18:01:33.000000000 +0100
++++ wine-1.1.15/tools/winebuild/utils.c	2009-02-25 14:52:51.450410422 +0100
+@@ -250,13 +250,6 @@
+ {
+     if (!as_command)
+     {
+-        if (target_alias)
+-        {
+-            as_command = xmalloc( strlen(target_alias) + sizeof("-as") );
+-            strcpy( as_command, target_alias );
+-            strcat( as_command, "-as" );
+-        }
+-        else
+         {
+             static const char * const commands[] = { "gas", "as", NULL };
+             if (!(as_command = find_tool( commands ))) as_command = xstrdup("as");
+--- wine-1.1.15/tools/winebuild/utils.c~	2009-02-25 14:53:45.976730869 +0100
++++ wine-1.1.15/tools/winebuild/utils.c	2009-02-25 14:56:43.257219329 +0100
+@@ -269,13 +269,6 @@
+ {
+     if (!ld_command)
+     {
+-        if (target_alias)
+-        {
+-            ld_command = xmalloc( strlen(target_alias) + sizeof("-ld") );
+-            strcpy( ld_command, target_alias );
+-            strcat( ld_command, "-ld" );
+-        }
+-        else
+         {
+             static const char * const commands[] = { "ld", "gld", NULL };
+             if (!(ld_command = find_tool( commands ))) ld_command = xstrdup("ld");
+@@ -295,13 +288,6 @@
+ {
+     if (!nm_command)
+     {
+-        if (target_alias)
+-        {
+-            nm_command = xmalloc( strlen(target_alias) + sizeof("-nm") );
+-            strcpy( nm_command, target_alias );
+-            strcat( nm_command, "-nm" );
+-        }
+-        else
+         {
+             static const char * const commands[] = { "nm", "gnm", NULL };
+             if (!(nm_command = find_tool( commands ))) nm_command = xstrdup("nm");
================================================================


More information about the pld-cvs-commit mailing list