Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
a1be6b47
Commit
a1be6b47
authored
Oct 18, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Don't pass warning flags to external libraries.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a4b01382
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
2 deletions
+22
-2
makedep.c
tools/makedep.c
+22
-2
No files found.
tools/makedep.c
View file @
a1be6b47
...
...
@@ -128,6 +128,8 @@ static struct strarray target_flags;
static
struct
strarray
msvcrt_flags
;
static
struct
strarray
extra_cflags
;
static
struct
strarray
extra_cross_cflags
;
static
struct
strarray
extra_cflags_extlib
;
static
struct
strarray
extra_cross_cflags_extlib
;
static
struct
strarray
cpp_flags
;
static
struct
strarray
lddll_flags
;
static
struct
strarray
libs
;
...
...
@@ -2270,6 +2272,21 @@ static struct strarray get_source_defines( struct makefile *make, struct incl_fi
/*******************************************************************
* remove_warning_flags
*/
static
struct
strarray
remove_warning_flags
(
struct
strarray
flags
)
{
unsigned
int
i
;
struct
strarray
ret
=
empty_strarray
;
for
(
i
=
0
;
i
<
flags
.
count
;
i
++
)
if
(
strncmp
(
flags
.
str
[
i
],
"-W"
,
2
)
||
!
strncmp
(
flags
.
str
[
i
],
"-Wno-"
,
5
))
strarray_add
(
&
ret
,
flags
.
str
[
i
]
);
return
ret
;
}
/*******************************************************************
* get_debug_file
*/
static
const
char
*
get_debug_file
(
struct
makefile
*
make
,
const
char
*
name
)
...
...
@@ -3010,7 +3027,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
if
(
!*
dll_ext
&&
make
->
module
&&
is_crt_module
(
make
->
module
))
output_filename
(
"-fno-builtin"
);
}
output_filenames
(
extra_cflags
);
output_filenames
(
make
->
extlib
?
extra_cflags_extlib
:
extra_cflags
);
output_filenames
(
cpp_flags
);
output_filename
(
"$(CFLAGS)"
);
output
(
"
\n
"
);
...
...
@@ -3024,7 +3041,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
output
(
"%s.cross.o: %s
\n
"
,
obj_dir_path
(
make
,
obj
),
source
->
filename
);
output
(
"
\t
%s$(CROSSCC) -c -o $@ %s"
,
cmd_prefix
(
"CC"
),
source
->
filename
);
output_filenames
(
defines
);
output_filenames
(
extra_cross_cflags
);
output_filenames
(
make
->
extlib
?
extra_cross_cflags_extlib
:
extra_cross_cflags
);
if
(
make
->
module
&&
is_crt_module
(
make
->
module
))
output_filename
(
"-fno-builtin"
);
output_filenames
(
cpp_flags
);
...
...
@@ -4311,6 +4328,9 @@ int main( int argc, char *argv[] )
else
so_dir
=
pe_dir
=
"$(dlldir)"
;
extra_cflags_extlib
=
remove_warning_flags
(
extra_cflags
);
extra_cross_cflags_extlib
=
remove_warning_flags
(
extra_cross_cflags
);
top_makefile
->
src_dir
=
root_src_dir
;
subdirs
=
get_expanded_make_var_array
(
top_makefile
,
"SUBDIRS"
);
disabled_dirs
=
get_expanded_make_var_array
(
top_makefile
,
"DISABLED_SUBDIRS"
);
...
...
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