Mercurial > octave-nkf

changeset 20557:818122703f1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use CXXFLAGS to build *.df files (fix regression by 0ce7d8303152) * libinterp/module.mk, libinterp/corefcn/module.mk, libinterp/octave-value/module.mk: add CXXFLAGS since mumble_CXXFLAGS only includes AM_CXXFLAGS and WARN_CXXFLAGS, and automake does not add it automatically for this custome rules.
author Carnë Draug <carandraug@octave.org>
date Sat, 26 Sep 2015 16:32:28 +0100
parents 048f7cda88ea
children 88459dd6780f
files libinterp/corefcn/module.mk libinterp/module.mk libinterp/octave-value/module.mk
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/module.mk	Sat Sep 26 17:11:43 2015 +0200
+++ b/libinterp/corefcn/module.mk	Sat Sep 26 16:32:28 2015 +0100
@@ -271,7 +271,7 @@
 	$(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \
-	  $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) \
+	  $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) $(CXXFLAGS) \
 	  -DMAKE_BUILTINS $< > $@-t1 && \
 	$(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \
 	rm -f $@-t1 && \
--- a/libinterp/module.mk	Sat Sep 26 17:11:43 2015 +0200
+++ b/libinterp/module.mk	Sat Sep 26 16:32:28 2015 +0100
@@ -224,7 +224,7 @@
 	$(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(libinterp_liboctinterp_la_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \
-	  $(libinterp_liboctinterp_la_CXXFLAGS) \
+	  $(libinterp_liboctinterp_la_CXXFLAGS) $(CXXFLAGS) \
 	  -DMAKE_BUILTINS $< > $@-t1 && \
 	$(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \
 	rm -f $@-t1 && \
--- a/libinterp/octave-value/module.mk	Sat Sep 26 17:11:43 2015 +0200
+++ b/libinterp/octave-value/module.mk	Sat Sep 26 16:32:28 2015 +0100
@@ -138,7 +138,7 @@
 	$(AM_V_GEN)rm -f $@-t $@-t1 $@ && \
 	$(CXXCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	  $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \
-	  $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) \
+	  $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) $(CXXFLAGS) \
 	  -DMAKE_BUILTINS $< > $@-t1 && \
 	$(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \
 	mv $@-t $@ && \