Skip to content

Commit

Permalink
- Only link omniORB statically on OSX; it gives -fPIC errors when bui…
Browse files Browse the repository at this point in the history
…lding shared objects on 64-bit Linux

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8016 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Feb 25, 2011
1 parent a1d04df commit e275c99
Show file tree
Hide file tree
Showing 3 changed files with 131 additions and 140 deletions.
12 changes: 10 additions & 2 deletions Compiler/BackEnd/SimCode.mo
Expand Up @@ -8272,14 +8272,14 @@ Note: Normally only outputs a single string, but Lapack on MinGW is special."
algorithm
strs := matchcontinue exp
local
String str;
String str,str2;

// Lapack on MinGW/Windows is linked against f2c
case Absyn.STRING("Lapack")
equation
true = "Windows_NT" ==& System.os();
then {"-llapack-mingw", "-ltmglib-mingw", "-lblas-mingw", "-lf2c"};

// omcruntime on windows needs linking with mico2313 and wsock!
case Absyn.STRING(str as "omcruntime")
equation
Expand All @@ -8299,6 +8299,14 @@ algorithm
str = System.getCorbaLibs();
then {str};

// If omcruntime is linked statically against omniORB, we need to include those here as well
case Absyn.STRING(str as "omcruntime")
equation
false = "Windows_NT" ==& System.os();
str = "-l" +& str;
str2 = System.getCorbaLibs();
then {str, str2};

// If the string contains a dot, it's a good path that should not be prefix -l
case Absyn.STRING(str)
equation
Expand Down

0 comments on commit e275c99

Please sign in to comment.