diff --git a/Makefile.in b/Makefile.in
index 16953139362..9da4bf7d709 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,9 +5,9 @@ all: @ALL_TARGETS@ @OMLIBRARY_TARGET@
 omc:
 	$(MAKE) -C OMCompiler @OMC_TARGET@
 omlibrary-core:
-	$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" core
+	$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@ @CMAKE_LDFLAGS@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" core
 omlibrary-all:
-	$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" all
+	$(MAKE) -C libraries BUILD_DIR=@OMBUILDDIR@/lib/omlibrary "host_short=@host_short@" "RPATH_QMAKE=@RPATH_QMAKE@ @CMAKE_LDFLAGS@" "SHREXT=@SHREXT@" "MODELICA3D_TARGET=@MODELICA3D_TARGET@" all
 omplot: omc
 	$(MAKE) -C OMPlot
 omedit: omc omplot
diff --git a/configure.ac b/configure.ac
index 94ffd1a6f12..bc383ea9802 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,11 @@ AC_MSG_RESULT([yes])
 MODELICA3D_TARGET="omlibrary-modelica3d"
 fi
 
+AC_SUBST(CMAKE_LDFLAGS)
+if echo $host | grep -i darwin; then
+  CMAKE_LDFLAGS="-Wl,-undefined -Wl,dynamic_lookup"
+fi
+
 AC_SUBST(ALL_TARGETS)
 for dir_target in OMCompiler-omc OMPlot-omplot OMEdit-omedit OMNotebook-omnotebook OMOptim-omoptim OMShell-omshell; do
   dir=`echo $dir_target | cut -d- -f1`