diff options
| author | Pekka Paalanen <ppaalanen@gmail.com> | 2012-06-01 12:20:25 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-06-01 10:32:39 -0400 |
| commit | 15643f627df36635568a5c93d0b101a6cfc5efb9 (patch) | |
| tree | 4d65570bff0af5a1dddc5d0dec8dcfe7073ad9f0 | |
| parent | d95222e56f79c0602ab542300e0adf0c415cfaee (diff) | |
build: introduce GCC_CXXFLAGS
The patch "compositor-android: fix build flags" started using GCC_CFLAGS
for C++ files, too. That lead to the following warnings when building a
C++ file:
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for
Ada/C/ObjC but not for C++
cc1plus: warning: command line option "-Wmissing-prototypes" is valid
for Ada/C/ObjC but not for C++
Introduce GCC_CXXFLAGS, similar to GCC_CFLAGS, but for C++, avoiding the
problematic compiler flags.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index d8865f9..7d9b2a2 100644 --- a/configure.ac +++ b/configure.ac @@ -206,12 +206,14 @@ AM_CONDITIONAL(HAVE_RSVG_CONVERT, test -n "$RSVG_CONVERT") if test "x$GCC" = "xyes"; then - GCC_CFLAGS="-Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes \ - -Wno-unused-parameter -Wno-missing-field-initializers \ - -g -fvisibility=hidden" - + my_common_gcc_flags="-Wall -Wextra -Wno-unused-parameter \ + -Wno-missing-field-initializers -g -fvisibility=hidden" + GCC_CFLAGS="$my_common_gcc_flags \ + -Wstrict-prototypes -Wmissing-prototypes" + GCC_CXXFLAGS="$my_common_gcc_flags" fi AC_SUBST(GCC_CFLAGS) +AC_SUBST(GCC_CXXFLAGS) WAYLAND_SCANNER_RULES(['$(top_srcdir)/protocol']) diff --git a/src/Makefile.am b/src/Makefile.am index fd8aa9b..64932a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -130,7 +130,7 @@ android_backend = android-backend.la android_backend_la_LDFLAGS = -module -avoid-version android_backend_la_LIBADD = $(COMPOSITOR_LIBS) android_backend_la_CFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) -android_backend_la_CXXFLAGS = $(GCC_CFLAGS) $(COMPOSITOR_CFLAGS) +android_backend_la_CXXFLAGS = $(GCC_CXXFLAGS) $(COMPOSITOR_CFLAGS) android_backend_la_SOURCES = \ compositor-android.c \ android-framebuffer.cpp \ |