ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winebuild: Don't crash when dlltool or ar can't be found.

This commit is contained in:
Jonathan Liu 2013-12-14 16:50:00 +11:00 committed by Alexandre Julliard
parent 93bdde3af2
commit 9c992f8a15
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/winebuild/utils.c
View File

@ -323,7 +323,7 @@ struct strarray *find_tool( const char *name, const char * const *names )
/* split the path in directories */ /* split the path in directories */
if (!getenv( "PATH" )) return NULL; if (!getenv( "PATH" )) fatal_error( "PATH not set, cannot find required tools\n" );
path = xstrdup( getenv( "PATH" )); path = xstrdup( getenv( "PATH" ));
for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++; for (p = path, count = 2; *p; p++) if (*p == PATH_SEPARATOR) count++;
dirs = xmalloc( count * sizeof(*dirs) ); dirs = xmalloc( count * sizeof(*dirs) );
@ -374,7 +374,7 @@ struct strarray *find_tool( const char *name, const char * const *names )
free( file ); free( file );
names++; names++;
} }
return NULL; fatal_error( "cannot find the '%s' tool\n", name );
} }
struct strarray *get_as_command(void) struct strarray *get_as_command(void)
@ -397,9 +397,6 @@ struct strarray *get_as_command(void)
as_command = find_tool( "as", commands ); as_command = find_tool( "as", commands );
} }
if (!as_command)
fatal_error( "cannot find suitable assembler\n" );
args = strarray_copy( as_command ); args = strarray_copy( as_command );
if (force_pointer_size) if (force_pointer_size)
@ -437,9 +434,6 @@ struct strarray *get_ld_command(void)
ld_command = find_tool( "ld", commands ); ld_command = find_tool( "ld", commands );
} }
if (!ld_command)
fatal_error( "cannot find suitable linker\n" );
args = strarray_copy( ld_command ); args = strarray_copy( ld_command );
if (force_pointer_size) if (force_pointer_size)
@ -475,9 +469,6 @@ const char *get_nm_command(void)
static const char * const commands[] = { "nm", "gnm", NULL }; static const char * const commands[] = { "nm", "gnm", NULL };
nm_command = find_tool( "nm", commands ); nm_command = find_tool( "nm", commands );
} }
if (!nm_command)
fatal_error( "cannot find suitable name lister\n" );
if (nm_command->count > 1) if (nm_command->count > 1)
fatal_error( "multiple arguments in nm command not supported yet\n" ); fatal_error( "multiple arguments in nm command not supported yet\n" );
return nm_command->str[0]; return nm_command->str[0];