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

winegcc: Try harder to find out whether the compiler is from gcc family.

Browse Source
This commit is contained in:
Eric Pouech 2012-05-10 22:43:26 +02:00 committed by Alexandre Julliard
parent 47332210dd
commit b21da1d701
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/winegcc/winegcc.c
View File

@ -395,10 +395,10 @@ static char *get_lib_dir( struct options *opts )
static void compile(struct options* opts, const char* lang) static void compile(struct options* opts, const char* lang)
{ {
strarray* comp_args = strarray_alloc(); strarray* comp_args = strarray_alloc();
unsigned int j; unsigned int i, j;
int gcc_defs = 0; int gcc_defs = 0;
char* gcc; strarray* gcc;
char* gpp; strarray* gpp;
strarray_addall(comp_args, get_translator(opts)); strarray_addall(comp_args, get_translator(opts));
switch(opts->processor) switch(opts->processor)
@ -409,16 +409,19 @@ static void compile(struct options* opts, const char* lang)
/* mixing different C and C++ compilers isn't supported in configure anyway */ /* mixing different C and C++ compilers isn't supported in configure anyway */
case proc_cc: case proc_cc:
case proc_cxx: case proc_cxx:
gcc = build_tool_name(opts, "gcc", CC); gcc = strarray_fromstring(build_tool_name(opts, "gcc", CC), " ");
gpp = build_tool_name(opts, "g++", CXX); gpp = strarray_fromstring(build_tool_name(opts, "g++", CXX), " ");
for ( j = 0; !gcc_defs && j < comp_args->size; j++ ) for ( j = 0; !gcc_defs && j < comp_args->size; j++ )
{ {
const char *cc = comp_args->base[j]; const char *cc = comp_args->base[j];
gcc_defs = strendswith(cc, gcc) || strendswith(cc, gpp); for (i = 0; !gcc_defs && i < gcc->size; i++)
gcc_defs = gcc->base[i][0] != '-' && strendswith(cc, gcc->base[i]);
for (i = 0; !gcc_defs && i < gpp->size; i++)
gcc_defs = gpp->base[i][0] != '-' && strendswith(cc, gpp->base[i]);
} }
free(gcc); strarray_free(gcc);
free(gpp); strarray_free(gpp);
break; break;
} }