Mercurial > octave-nkf

changeset 20071:0e712de0af4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Fix build error with user-supplied CPPFLAGS (bug #44754) * libgui/Makefile.am: Use GNU Makefile filter command to include only CPPFLAGS options that are expected to be recognized by the MOC command.
author Mike Miller <mtmiller@octave.org>
date Mon, 06 Apr 2015 23:06:08 -0400
parents f68c3a62e42c
children 76c72314d905
files libgui/Makefile.am
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/Makefile.am	Mon Apr 06 23:05:41 2015 +0200
+++ b/libgui/Makefile.am	Mon Apr 06 23:06:08 2015 -0400
@@ -23,8 +23,9 @@
 MOC_CPPFLAGS =
 
 ## Fix for bug #42839 where -mieee CFLAG option is added to CPPFLAGS by gnulib.
-## Eventually gnulib will be appropriately fixed and this hack removed.
-MOC_OCTAVE_CPPFLAGS = $(filter-out -mieee, $(AM_CPPFLAGS) $(CPPFLAGS))
+## Users may also pass other options in CPPFLAGS that moc does not understand.
+## Only keep moc-compatible options -Idir, -Dmacro, and -Umacro.
+MOC_OCTAVE_CPPFLAGS = $(filter -I% -D% -U%, $(AM_CPPFLAGS) $(CPPFLAGS))
 
 octlib_LTLIBRARIES = liboctgui.la