Fix OSX compilation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18492 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Dec 16, 2013 · d5bef05 · d5bef05
1 parent 49b7807
commit d5bef05
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/configure.in b/configure.in
@@ -785,8 +785,8 @@ if test "Darwin" = `uname`; then
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.dylib
   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"
   RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE $LDFLAGS -lSimulationRuntimeC $LD_LAPACK -lm -lgc"
@@ -808,10 +808,10 @@ elif test "$host" = "i586-pc-mingw32msvc"; then
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
   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'"
   OS_TARGET="windows"
@@ -831,8 +831,8 @@ else
   FMILIB_SHARED=ON
   # 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"
   RT_LDFLAGS_GENERATED_CODE_SIM="$RT_LDFLAGS_GENERATED_CODE -lSimulationRuntimeC $LD_LAPACK -lm -lgc -lpthread -rdynamic"