Fix rpath on OSX

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16399 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 19, 2013 · 2c8a33b · 2c8a33b
1 parent 0fc45a4
commit 2c8a33b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Compiler/omc_release/Makefile.in b/Compiler/omc_release/Makefile.in
@@ -30,7 +30,7 @@ endif
 
 LDFLAGS = @LDFLAGS@ -lm -L$(RMLHOME)/lib/plain -lrml \
   $(LIBSOCKET) $(CORBALIBS) $(LIBLPSOLVE55) \
-  -L../../build/lib/omc -Wl,-rpath,'$$ORIGIN/../lib/omc' @RT_LDFLAGS@ @LD_LAPACK@ @SQLITE3_LIBS@
+  -L../../build/lib/omc @RPATH@ @RT_LDFLAGS@ @LD_LAPACK@ @SQLITE3_LIBS@
 
 PROG = omc
 RMLC	= @rmlc_bin@

diff --git a/configure.in b/configure.in
@@ -60,6 +60,7 @@ AC_SUBST(LIBRUNTIME)
 AC_SUBST(LIBFMIRUNTIME)
 AC_SUBST(SHREXT)
 AC_SUBST(LINK)
+AC_SUBST(RPATH)
 
 FINAL_MESSAGES="\nConfigured OpenModelica successfully using the following options:"
 
@@ -655,6 +656,7 @@ if test "Darwin" = `uname`; then
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
   RT_LDFLAGS="$RT_LDFLAGS -liconv -lgc $OPENMP"
   LINK="cp -fr"
+  RPATH="-Wl,-rpath,'@loader_path/../lib/omc'"
 else
   EXE=""
   SHREXT=".so"
@@ -664,6 +666,7 @@ else
   LIBFMIRUNTIME=libOpenModelicaFMIRuntimeC.a
   RT_LDFLAGS="$RT_LDFLAGS -lrt -lgc $OPENMP"
   LINK="cp -frl"
+  RPATH="-Wl,-rpath,'$$ORIGIN/../lib/omc'"
 fi
 
 dnl should we compile modpar