From 3ec37394718ed812e6025fefa77ba762c76caf3b Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Fri, 6 Mar 2009 12:23:48 +0000 Subject: [PATCH] Also use CPPFLAGS when compiling C++ code --- src/makefile.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/makefile.c b/src/makefile.c index 867960c..10d8486 100644 --- a/src/makefile.c +++ b/src/makefile.c @@ -837,10 +837,15 @@ static void _flags_cxx(Configure * configure, FILE * fp, String const * target) { String const * p; - fprintf(fp, "%s%s", target, "_CXXFLAGS = $(CXXFLAGSF) $(CXXFLAGS)"); + fprintf(fp, "%s%s", target, "_CXXFLAGS = $(CPPFLAGSF) $(CPPFLAGS)" + " $(CXXFLAGSF) $(CXXFLAGS)"); if((p = config_get(configure->config, target, "cxxflags")) != NULL) fprintf(fp, " %s", p); fputc('\n', fp); + fprintf(fp, "%s%s", target, "_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)"); + if((p = config_get(configure->config, target, "ldflags")) != NULL) + fprintf(fp, " %s", p); + fputc('\n', fp); } static int _target_library(Configure * configure, FILE * fp,