Link in libstdc++ also for dynload since it contains the csv reader

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18268 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 24, 2013 · ddb3c67 · ddb3c67
1 parent 464082a
commit ddb3c67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/SimulationRuntime/c/Makefile.common b/SimulationRuntime/c/Makefile.common
@@ -116,7 +116,7 @@ libOpenModelicaRuntimeC.so: $(BASE_OBJS)
 
 libOpenModelicaRuntimeC.dylib: $(BASE_OBJS)
 	@rm -f $@
-	$(CC) -shared -o $@ $(BASE_OBJS) $(LDFLAGS) -install_name '@rpath/$@'
+	$(CC) -shared -o $@ $(BASE_OBJS) $(LDFLAGS) -undefined dynamic_lookup -install_name '@rpath/$@'
 
 libOpenModelicaFMIRuntimeC.a: $(FMIOBJSPATH)
 	@rm -f $@

diff --git a/configure.in b/configure.in
@@ -776,8 +776,8 @@ if test "Darwin" = `uname`; then
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.dylib
   LIBFMILIB=libfmilib_shared.dylib
   FMILIB_SHARED=ON
-  RT_LDFLAGS_SIM="$RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lstdc++ -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl"
-  RT_LDFLAGS="$RT_LDFLAGS $LD_LAPACK -liconv -lgc -lpthread -lm -ldl"
+  RT_LDFLAGS_SIM="$RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS -linteractive -llis -lf2c -lexpat -liconv -lgc -lpthread -lm -ldl -lstdc++"
+  RT_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="-lOpenModelicaRuntimeC $LD_LAPACK -lm"
   RT_LDFLAGS_GENERATED_CODE_SIM="-lSimulationRuntimeC $LD_LAPACK -lm"
@@ -822,8 +822,8 @@ else
   FMILIB_SHARED=ON
   # For static runtime on Linux:
   # -Wl,-whole-archive -lSimulationRuntimeC -Wl,-no-whole-archive
-  RT_LDFLAGS_SIM="$RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $LIBRT -linteractive -llis -lstdc++ -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm -ldl"
-  RT_LDFLAGS="$RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl"
+  RT_LDFLAGS_SIM="$RT_LDFLAGS $SUNDIALS_LDFLAGS $IPOPT_LDFLAGS $LIBRT -linteractive -llis -Wl,-Bstatic -lf2c -Wl,-Bdynamic -lexpat -lgc $LIBRT -lpthread -lm -ldl -lstdc++"
+  RT_LDFLAGS="$RT_LDFLAGS $LD_LAPACK -lgc $LIBRT -lpthread -lm -ldl -lstdc++"
   # All libraries are dynamically linked; we don't need anything else
   RT_LDFLAGS_GENERATED_CODE="-lOpenModelicaRuntimeC $LD_LAPACK -lm"
   RT_LDFLAGS_GENERATED_CODE_SIM="-lSimulationRuntimeC $LD_LAPACK -lm"