- Use @cxx@ for C++ when linking omc

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8765 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 1, 2011 · 5d15256 · 5d15256
1 parent f0c913c
commit 5d15256
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Compiler/omc_debug/Makefile.in b/Compiler/omc_debug/Makefile.in
@@ -45,4 +45,4 @@ include $(srcdir)/Makefile.compiler_subdirs.common
 	# You're using the proper Unix Makefile. Thanks for making my life easier.
 
 $(PROG): $(SRCO) $(SUBDIRS) $(top_builddir)/c_runtime/sendData/*.cpp
-	g++ $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS) $(PLTPKGFLAGS)
+	$(CXX) $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS) $(PLTPKGFLAGS)
diff --git a/Compiler/omc_profiler/Makefile.in b/Compiler/omc_profiler/Makefile.in
@@ -42,4 +42,4 @@ include $(srcdir)/Makefile.compiler_subdirs.common
 	# You're using the proper Unix Makefile. Thanks for making my life easier.
 
 $(PROG): $(SRCO) $(SUBDIRS) $(top_builddir)/c_runtime/sendData/*.cpp
-	g++ $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS) $(PLTPKGFLAGS)
+	$(CXX) $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS) $(PLTPKGFLAGS)
diff --git a/Compiler/omc_release/Makefile.in b/Compiler/omc_release/Makefile.in
@@ -42,4 +42,4 @@ include $(srcdir)/Makefile.compiler_subdirs.common
 	# You're using the proper Unix Makefile. Thanks for making my life easier.
 
 $(PROG): $(SRCO) $(SUBDIRS) $(top_builddir)/c_runtime/sendData/*.cpp
-	g++ $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
+	$(CXX) $(CFLAGS) -o $(PROG)$(EXEEXT) $(SRCO) $(AST) $(RTOBJ) $(LDFLAGS)
diff --git a/c_runtime/Makefile.in b/c_runtime/Makefile.in
@@ -10,7 +10,7 @@ builddir_lib=$(top_builddir)/build/lib/omc
 builddir_inc=$(top_builddir)/build/include/omc
 
 CC := @CC@
-CXX := @CC@
+CXX := @CXX@
 CFLAGS := @CFLAGS@
 
 LIBF2CMAKEFILE = makefile.u