- try to fix bootstrapper

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19297 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 25, 2014 · 1547841 · 1547841
1 parent c4d3279
commit 1547841
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/Compiler/BackEnd/SimCodeUtil.mo b/Compiler/BackEnd/SimCodeUtil.mo
@@ -5700,7 +5700,7 @@ algorithm
   omhome := Settings.getInstallationDirectoryPath();
   omhome := System.trim(omhome, "\""); // Remove any quotation marks from omhome.
   cflags := System.getCFlags() +& " " +& 
-            Util.if_(Flags.isSet(Flags.OPENMP) or Flags.isSet(Flags.HPCOM),System.getOMPFlag(), "");
+            Util.if_(Flags.isSet(Flags.OPENMP) or Flags.isSet(Flags.HPCOM),"-fopenmp", "");
   cflags := Util.if_(stringEq(Config.simCodeTarget(),"JavaScript"),"-Os -Wno-warn-absolute-paths",cflags);
   ldflags := System.getLDFlags();
   rtlibs := Util.if_(isFunction, System.getRTLibs(), System.getRTLibsSim());

diff --git a/Compiler/Util/System.mo b/Compiler/Util/System.mo
@@ -202,11 +202,11 @@ public function getCXXCompiler
   external "C" outString=System_getCXXCompiler() annotation(Library = "omcruntime");
 end getCXXCompiler;
 
-public function getOMPFlag
+public function getOMPCCompiler
   output String outString;
 
-  external "C" outString=System_getOMPFlag() annotation(Library = "omcruntime");
-end getOMPFlag;
+  external "C" outString=System_getOMPCCompiler() annotation(Library = "omcruntime");
+end getOMPCCompiler;
 
 public function setLinker
   input String inString;

diff --git a/Compiler/runtime/System_omc.c b/Compiler/runtime/System_omc.c
@@ -135,9 +135,9 @@ extern const char* System_getCXXCompiler()
   return GC_strdup(cxx);
 }
 
-extern const char* System_getOMPFlag()
+extern const char* System_getOMPCCompiler()
 {
-  return GC_strdup(omp);
+  return GC_strdup(omp_cc);
 }
 
 extern const char* System_getLinker()

diff --git a/Compiler/runtime/System_rml.c b/Compiler/runtime/System_rml.c
@@ -384,11 +384,11 @@ RML_BEGIN_LABEL(System__getCXXCompiler)
 }
 RML_END_LABEL
 
-RML_BEGIN_LABEL(System__getOMPFlag)
+RML_BEGIN_LABEL(System__getOMPCCompiler)
 {
-  if (omp == NULL)
+  if (omp_cc == NULL)
     RML_TAILCALLK(rmlFC);
-  rmlA0 = (void*) mk_scon(omp);
+  rmlA0 = (void*) mk_scon(omp_cc);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL

diff --git a/Compiler/runtime/config.h b/Compiler/runtime/config.h
@@ -35,8 +35,7 @@
 
 #define DEFAULT_CC "gcc"
 #define DEFAULT_CXX "g++"
-#define DEFAULT_OMP "-fopenmp"
-//#define DEFAULT_OMPCC "gcc -fopenmp"
+#define DEFAULT_OMPCC "gcc -fopenmp"
 #define DEFAULT_MAKE "make"
 
 /* adrpo: add -loleaut32 as is used by ExternalMedia */