Use the configured CXX in cppruntime

OpenModelica · May 20, 2015 · 060a0ac · 060a0ac
1 parent 38d0c59
commit 060a0ac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Compiler/BackEnd/HpcOmMemory.mo b/Compiler/BackEnd/HpcOmMemory.mo
@@ -1954,7 +1954,7 @@ encapsulated package HpcOmMemory
           //print("convertCacheToVarArrayMapping: " + intString(Util.tuple33(currentVarIndices)) + " is the start index for bool variables\n");
           ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(listReverse(notOptimizedVarsBool), function SimCodeUtil.addVarToArrayIndexMapping(iVarType=VARDATATYPE_BOOLEAN), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
 
-          BaseHashTable.dumpHashTable(varArrayIndexMappingHashTable);
+          //BaseHashTable.dumpHashTable(varArrayIndexMappingHashTable);
           ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(iAliasVars, function SimCodeUtil.addVarToArrayIndexMapping(iVarType=VARDATATYPE_FLOAT), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
           ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(iIntAliasVars, function SimCodeUtil.addVarToArrayIndexMapping(iVarType=VARDATATYPE_INTEGER), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));
           ((currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable)) = List.fold(iBoolAliasVars, function SimCodeUtil.addVarToArrayIndexMapping(iVarType=VARDATATYPE_BOOLEAN), (currentVarIndices, varArrayIndexMappingHashTable, varIndexMappingHashTable));

diff --git a/SimulationRuntime/cpp/Makefile.in b/SimulationRuntime/cpp/Makefile.in
@@ -38,7 +38,7 @@ ifneq ("$(RUNTIME_PROFILING)","true")
 	$(eval RUNTIME_PROFILING_COMMAND=)
 endif
 ifneq ("$(USE_SCOREP)","true") #If ScoreP ist used, the analyzation mode is automatically turned on
-	$(eval CMAKE_COMMANDS=)
+	$(eval CMAKE_COMMANDS=CC="@CC@" CXX="@CXX@" CFLAGS="@CFLAGS@" CXXFLAGS="@CXXFLAGS@")
 	$(eval SCOREP_COMMAND=)
 else
 	$(eval RUNTIME_STATIC_LINKING_COMMAND="-DRUNTIME_STATIC_LINKING=ON")
@@ -55,3 +55,6 @@ install: runtimeCpp
 clean:
 	rm -R -f Build
 	mkdir Build
+
+Makefile: Makefile.in
+	cd @top_builddir@ && ./config.status
diff --git a/configure.ac b/configure.ac
@@ -209,7 +209,7 @@ for flag in $CXXFLAGS; do
   (echo $flag | grep -q "^-std=") && HAVE_CXX_STD=1
 done
 if test "$HAVE_CXX_STD" = 0; then
-  AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
+  AX_CXX_COMPILE_STDCXX_11([noext],[optional])
 fi
 
 if test "`getconf LONG_BIT`" = "32"; then