DeforaOS/configure
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hopefully better handling of C++ targets

Browse Source
This commit is contained in:
Pierre Pronchery 2013-06-04 03:24:49 +02:00
parent bf65f88f4b
commit afdfa13eff
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/makefile.c
View File

@ -532,24 +532,30 @@ static void _targets_cflags(Configure * configure, FILE * fp)
static void _targets_cxxflags(Configure * configure, FILE * fp) static void _targets_cxxflags(Configure * configure, FILE * fp)
{ {
String const * p; String const * cxx;
String const * q; String const * cxxff;
String const * cxxf;
if((p = config_get(configure->config, NULL, "cxxflags_force")) != NULL) cxx = config_get(configure->config, NULL, "cxx");
cxxff = config_get(configure->config, NULL, "cxxflags_force");
cxxf = config_get(configure->config, NULL, "cxxflags");
if(cxx != NULL || cxxff != NULL || cxxf != NULL)
{ {
_makefile_output_variable(fp, "CXX", configure->programs.cxx); if(cxx == NULL)
fprintf(fp, "%s%s", "CXXFLAGSF= ", p); cxx = configure->programs.cxx;
if(configure->os == HO_GNU_LINUX && string_find(p, "-ansi")) _makefile_output_variable(fp, "CXX", cxx);
}
if(cxxff != NULL)
{
fprintf(fp, "%s%s", "CXXFLAGSF= ", cxxff);
if(configure->os == HO_GNU_LINUX && string_find(cxxff, "-ansi"))
fprintf(fp, "%s", " -D _GNU_SOURCE"); fprintf(fp, "%s", " -D _GNU_SOURCE");
fputc('\n', fp); fputc('\n', fp);
} }
if((q = config_get(configure->config, NULL, "cxxflags")) != NULL) if(cxxf != NULL)
{ {
if(p == NULL) fprintf(fp, "%s%s", "CXXFLAGS= ", cxxf);
_makefile_output_variable(fp, "CXX", if(configure->os == HO_GNU_LINUX && string_find(cxxf, "-ansi"))
configure->programs.cxx);
fprintf(fp, "%s%s", "CXXFLAGS= ", q);
if(configure->os == HO_GNU_LINUX && string_find(q, "-ansi"))
fprintf(fp, "%s", " -D _GNU_SOURCE"); fprintf(fp, "%s", " -D _GNU_SOURCE");
fputc('\n', fp); fputc('\n', fp);
} }