diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2021-04-17 13:56:56 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2021-04-17 13:56:56 (GMT) |
| commit | 58afc7858cffe180bafbae306db6be66d313b74b (patch) | |
| tree | 6ccba3064e1b1d49faf1099d3d6fe3c600192819 /plugins/arm | |
| parent | b25638b8b13ffa833414c6a7c48fffdac12eda61 (diff) | |
Remove hardcoded run paths from libraries.
Diffstat (limited to 'plugins/arm')
| -rw-r--r-- | plugins/arm/Makefile.am | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/plugins/arm/Makefile.am b/plugins/arm/Makefile.am index 66cff6f..a37cbbd 100644 --- a/plugins/arm/Makefile.am +++ b/plugins/arm/Makefile.am @@ -4,22 +4,32 @@ lib_LTLIBRARIES = libarm.la libdir = $(pluginslibdir) +if BUILD_PYTHON_PACKAGE + +RUN_PATH = -Wl,-rpath,'$$ORIGIN/../chrysalide-libs' + +endif + if BUILD_PYTHON3_BINDINGS PYTHON3_LIBADD = python/libarmpython.la if BUILD_DISCARD_LOCAL -PYTHON3_LDFLAGS = -Wl,-rpath,$(pluginslibdir) \ - -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so +if BUILD_PYTHON_PACKAGE +PYTHON3_RUN_PATH = -Wl,-rpath,'$$ORIGIN/..' +else +PYTHON3_RUN_PATH = -Wl,-rpath,'$$ORIGIN' +endif else -PYTHON3_LDFLAGS = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs \ - -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so +PYTHON3_RUN_PATH = -Wl,-rpath,$(abs_top_srcdir)/plugins/pychrysalide/.libs endif +PYTHON3_LDFLAGS = $(PYTHON3_RUN_PATH) -L$(top_srcdir)/plugins/pychrysalide/.libs -l:pychrysalide.so + PYTHON3_SUBDIRS = python endif @@ -43,8 +53,9 @@ libarm_la_LIBADD = \ v7/libarmv7.la libarm_la_LDFLAGS = \ + -avoid-version \ -L$(top_srcdir)/src/.libs -lchrysacore \ - $(PYTHON3_LDFLAGS) + $(RUN_PATH) $(PYTHON3_LDFLAGS) devdir = $(includedir)/chrysalide/$(subdir) |