Add CXXFLAGS to some libraries

OpenModelica · Apr 14, 2016 · 44087ac · 44087ac
1 parent b85a431
commit 44087ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Compiler/runtime/Makefile.in b/Compiler/runtime/Makefile.in
@@ -30,7 +30,7 @@ CC	= @CC@
 CXX	= @CXX@
 IDL	= @IDLCMD@
 IDLPYTHON = @IDLPYTHONCMD@
-CXXFLAGS = $(CFLAGS)
+CXXFLAGS = $(CFLAGS) @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@ -I$(top_builddir)/SimulationRuntime/c -I$(top_builddir)/SimulationRuntime/c/simulation/results -I$(top_builddir)/SimulationRuntime/c/util -I$(top_builddir)/SimulationRuntime/c/meta -I$(top_builddir)/SimulationRuntime/c/meta/gc -I. $(CORBAINCL) -I$(FMIINCLUDE) -I$(top_builddir)/3rdParty/gc/include -I$(GRAPHSTREAMINCLUDE) -I$(GRAPHINCLUDE) -I$(CJSONINCLUDE)
 TRIPLE=@host_short@
 

diff --git a/Makefile.common b/Makefile.common
@@ -385,7 +385,7 @@ msgpack-clean:
 	rm -f 3rdParty/msgpack-0.5.8/Makefile
 
 graphstream: mkbuilddirs $(OMBUILDDIR)/share/omc/java/org.omc.graphstream.jar
-	if test -f 3rdParty/graphstream/Makefile; then $(MAKE) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" -C 3rdParty/graphstream/; fi
+	if test -f 3rdParty/graphstream/Makefile; then $(MAKE) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) $(CXXFLAGS)" -C 3rdParty/graphstream/; fi
 
 $(OMBUILDDIR)/share/omc/java/org.omc.graphstream.jar: mkbuilddirs
 	if test -f 3rdParty/graphstream/org.omc.graphstream.jar; then cp -p 3rdParty/graphstream/org.omc.graphstream.jar $(OMBUILDDIR)/share/omc/java/.; fi