Skip to content

Commit

Permalink
Use rpath provided by configure
Browse files Browse the repository at this point in the history
This fixes the hard-coded OSX-specific rpath flags used in the
makefiles.
  • Loading branch information
sjoelund committed Oct 2, 2017
1 parent 999d33b commit e1ab402
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion OMShell/OMShellGUI/OMShell.config.in
@@ -1,7 +1,7 @@
QMAKE_CC = @CC@
QMAKE_CXX = @CXX@
QMAKE_LINK = @CXX@
OMCLIBS = -L@OPENMODELICAHOME@/lib/@host_short@/omc -Wl,-rpath,@loader_path/../../../../lib/@host_short@/omc,-rpath,@loader_path/../../../../lib/,-rpath,@OMBUILDDIR@/lib/@host_short@/omc,-rpath,@OMBUILDDIR@/lib/ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc -lomantlr3
OMCLIBS = -L@OPENMODELICAHOME@/lib/@host_short@/omc @RPATH_QMAKE@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc -lomantlr3
OMCINC = @OMBUILDDIR@/include/omc/c
INCLUDEPATH += $$system(echo @CFLAGS@ | sed "s/\ //g" | grep ^-I | sed s/^-I//)
QMAKE_CFLAGS = -g @CFLAGS@ @CPPFLAGS@
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -6,6 +6,7 @@ AC_INIT([OMShell],[dev],[https://trac.openmodelica.org/OpenModelica],[openmodeli
AC_SUBST(APP)
AC_SUBST(EXE)
AC_SUBST(IDLCMD)
AC_SUBST(RPATH)
AC_SUBST(RPATH_QMAKE)
AC_SUBST(host_short)

Expand Down
2 changes: 1 addition & 1 deletion mosh/src/Makefile.in
Expand Up @@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@
CXXFLAGS = $(CFLAGS)
LDFLAGS = @LDFLAGS@ $(LIBS)

LIBS = @LIBREADLINE@ -lncurses -lm -lpthread -L@OMBUILDDIR@/lib/@host_short@/omc -Wl,-rpath,@loader_path/../../../../lib/@host_short@/omc,-rpath,@loader_path/../../../../lib/,-rpath,@OMBUILDDIR@/lib/@host_short@/omc,-rpath,@OMBUILDDIR@/lib/ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc -lomantlr3
LIBS = @LIBREADLINE@ -lncurses -lm -lpthread -L@OMBUILDDIR@/lib/@host_short@/omc @RPATH@ -lOpenModelicaCompiler -lOpenModelicaRuntimeC -lfmilib_shared -lModelicaExternalC -lomcgc -lomantlr3


OBJS += mosh.o omcinteractiveenvironment.o options.o
Expand Down

0 comments on commit e1ab402

Please sign in to comment.