From: Billy Laws blaws05@gmail.com
--- configure.ac | 3 +++ tools/makedep.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index c015c049831..2d841d0d496 100644 --- a/configure.ac +++ b/configure.ac @@ -794,6 +794,7 @@ AS_VAR_SET_IF([enable_archs],
saved_CC=$CC saved_CFLAGS=$CFLAGS +saved_CPPFLAGS=$CPPFLAGS saved_LDFLAGS=$LDFLAGS
AS_UNSET(extra_arch) @@ -832,6 +833,7 @@ do esac])
CFLAGS=${CROSSCFLAGS:-"-g -O2"} + CPPFLAGS="" LDFLAGS=$CROSSLDFLAGS AS_VAR_COPY([CC],[${wine_arch}_CC]) AS_VAR_COPY([${wine_arch}_CFLAGS],[CFLAGS]) @@ -1012,6 +1014,7 @@ done
CC=$saved_CC CFLAGS=$saved_CFLAGS +CPPFLAGS=$saved_CPPFLAGS LDFLAGS=$saved_LDFLAGS
case $HOST_ARCH in diff --git a/tools/makedep.c b/tools/makedep.c index 5e409d16cd9..3bc15760ada 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3264,7 +3264,7 @@ static void output_source_one_arch( struct makefile *make, struct incl_file *sou if (make->module && is_crt_module( make->module )) strarray_add( &cflags, "-fno-builtin" ); }
- strarray_addall( &cflags, cpp_flags ); + if (source->file->flags & FLAG_C_UNIX) strarray_addall( &cflags, cpp_flags );
output( "%s: %s\n", obj_dir_path( make, obj_name ), source->filename ); output( "\t%s%s -c -o $@ %s", cmd_prefix( "CC" ), var_cc, source->filename );