Skip to content

Commit

Permalink
Add rpath for the C runtime libraries
Browse files Browse the repository at this point in the history
When linking against the C runtime, we usually add rpath entries for all
the paths. But the C++ runtime does not do this, which seems to break
linking on Ubuntu 17.10. So we now add rpath entries in the shared
object itself, which solves this problem (ticket:4605).

Belonging to [master]:
  - OpenModelica/OMCompiler#1967
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Nov 1, 2017
1 parent b3c9646 commit 0a64f00
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion SimulationRuntime/c/Makefile.in
Expand Up @@ -24,7 +24,7 @@ FPMATHFORTRAN = @FPMATHFORTRAN@
OMBUILDDIR = @OMBUILDDIR@

ifeq ($(OMC_MINIMAL_RUNTIME),)
LDFLAGS=-L$(OMBUILDDIR)/lib/@host_short@/omc @RT_LDFLAGS@ @RT_LDFLAGS_OPTIONAL@
LDFLAGS=-L$(OMBUILDDIR)/lib/@host_short@/omc @RT_LDFLAGS@ @RT_LDFLAGS_OPTIONAL@ @RPATH@
LDFLAGS_SIM=-L$(OMBUILDDIR)/lib/@host_short@/omc -L$(CDASKRDIR) @RT_LDFLAGS_SIM@ @RT_LDFLAGS_SIM_OPTIONAL@
else
LDFLAGS=-L$(OMBUILDDIR)/lib/@host_short@/omc @RT_LDFLAGS@
Expand Down

0 comments on commit 0a64f00

Please sign in to comment.