Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
9c992f8a
Commit
9c992f8a
authored
Dec 14, 2013
by
Jonathan Liu
Committed by
Alexandre Julliard
Dec 16, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winebuild: Don't crash when dlltool or ar can't be found.
parent
93bdde3a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
11 deletions
+2
-11
utils.c
tools/winebuild/utils.c
+2
-11
No files found.
tools/winebuild/utils.c
View file @
9c992f8a
...
@@ -323,7 +323,7 @@ struct strarray *find_tool( const char *name, const char * const *names )
...
@@ -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 )
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment