Changeset d5bef05 in OpenModelica

Timestamp:

2013-12-16T12:42:40+01:00 (10 years ago)

Author:

Martin Sjölund <martin.sjolund@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

f67dc27f

Parents:

49b7807

Message:

Fix OSX compilation

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@18492 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

File:

• configure.in (modified) (3 diffs)

configure.in

@@ -786 +786 @@
   LIBFMILIB=libfmilib_shared.dylib
   FMILIB_SHARED=ON
-  RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl -lstdc++"
-  RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm -ldl -lstdc++"
+  RT_LDFLAGS_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl -lstdc++"
+  RT_LDFLAGS="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS $RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm -ldl -lstdc++"
   # All libraries are dynamically linked; we don't need anything else
   RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lOpenModelicaRuntimeC $LD_LAPACK -lm"
@@ -809 +809 @@
   LIBFMILIB=libfmilib.a
   FMILIB_SHARED=OFF
-  RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lstdc++ -lf2c -lgc -lexpat -lm"
-  RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
-  RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
-  RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lSimulationRuntimeC $RT_LDFLAGS_SIM"
+  RT_LDFLAGS_SIM="$LDFLAGS $RT_LDFLAGS_GENERATED_CODE $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lstdc++ -lf2c -lgc -lexpat -lm"
+  RT_LDFLAGS="$LDFLAGS $RT_LDFLAGS_GENERATED_CODE $RT_LDFLAGS $LD_LAPACK -lgc -lexpat -lpthread -lm"
+  RT_LDFLAGS_GENERATED_CODE="$LDFLAGS -lOpenModelicaRuntimeC $RT_LDFLAGS"
+  RT_LDFLAGS_GENERATED_CODE_SIM="$LDFLAGS -lSimulationRuntimeC $RT_LDFLAGS_SIM"
   LINK="cp -frl"
   RPATH="-Wl,-rpath,'\$\$ORIGIN/../lib/omc'"
@@ -832 +832 @@
   # For static runtime on Linux:
   # -Wl,-whole-archive -lSimulationRuntimeC -Wl,-no-whole-archive
-  RT_LDFLAGS_SIM="-Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $LIBRT -linteractive -llis -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
-  RT_LDFLAGS="$RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
+  RT_LDFLAGS_SIM="-Wl,-rpath,'\$\$ORIGIN' $RT_LDFLAGS $RT_LDFLAGS_GENERATED_CODE $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $LIBRT -linteractive -llis -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
+  RT_LDFLAGS="$RT_LDFLAGS $RT_LDFLAGS_GENERATED_CODE $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl -lstdc++ -rdynamic"
   # All libraries are dynamically linked; we don't need anything else
   RT_LDFLAGS_GENERATED_CODE="$RT_LDFLAGS_GENERATED_CODE -lOpenModelicaRuntimeC $LD_LAPACK -lm -rdynamic"