]>
Commit | Line | Data |
---|---|---|
2877d0e0 AM |
1 | --- wine-1.1.15/tools/winegcc/winegcc.c~ 2009-02-13 18:01:33.000000000 +0100 |
2 | +++ wine-1.1.15/tools/winegcc/winegcc.c 2009-02-25 14:37:44.743493303 +0100 | |
3 | @@ -302,8 +302,7 @@ | |
4 | else str = CXX; | |
5 | break; | |
6 | case proc_as: | |
7 | - if (opts->target) str = strmake( "%s-as", opts->target ); | |
8 | - else str = AS; | |
9 | + str = AS; | |
10 | break; | |
11 | default: | |
12 | assert(0); | |
13 | --- wine-1.1.15/tools/winebuild/utils.c~ 2009-02-13 18:01:33.000000000 +0100 | |
14 | +++ wine-1.1.15/tools/winebuild/utils.c 2009-02-25 14:52:51.450410422 +0100 | |
15 | @@ -250,13 +250,6 @@ | |
16 | { | |
17 | if (!as_command) | |
18 | { | |
19 | - if (target_alias) | |
20 | - { | |
21 | - as_command = xmalloc( strlen(target_alias) + sizeof("-as") ); | |
22 | - strcpy( as_command, target_alias ); | |
23 | - strcat( as_command, "-as" ); | |
24 | - } | |
25 | - else | |
26 | { | |
27 | static const char * const commands[] = { "gas", "as", NULL }; | |
28 | if (!(as_command = find_tool( commands ))) as_command = xstrdup("as"); | |
29 | --- wine-1.1.15/tools/winebuild/utils.c~ 2009-02-25 14:53:45.976730869 +0100 | |
30 | +++ wine-1.1.15/tools/winebuild/utils.c 2009-02-25 14:56:43.257219329 +0100 | |
31 | @@ -269,13 +269,6 @@ | |
32 | { | |
33 | if (!ld_command) | |
34 | { | |
35 | - if (target_alias) | |
36 | - { | |
37 | - ld_command = xmalloc( strlen(target_alias) + sizeof("-ld") ); | |
38 | - strcpy( ld_command, target_alias ); | |
39 | - strcat( ld_command, "-ld" ); | |
40 | - } | |
41 | - else | |
42 | { | |
43 | static const char * const commands[] = { "ld", "gld", NULL }; | |
44 | if (!(ld_command = find_tool( commands ))) ld_command = xstrdup("ld"); | |
45 | @@ -295,13 +288,6 @@ | |
46 | { | |
47 | if (!nm_command) | |
48 | { | |
49 | - if (target_alias) | |
50 | - { | |
51 | - nm_command = xmalloc( strlen(target_alias) + sizeof("-nm") ); | |
52 | - strcpy( nm_command, target_alias ); | |
53 | - strcat( nm_command, "-nm" ); | |
54 | - } | |
55 | - else | |
56 | { | |
57 | static const char * const commands[] = { "nm", "gnm", NULL }; | |
58 | if (!(nm_command = find_tool( commands ))) nm_command = xstrdup("nm"); |