Merge branch 'develop' into 'develop'

osx: fix #343 runtime path

Closes #343

See merge request !45
This commit is contained in:
Daniel Kochmański 2017-01-20 06:17:29 +00:00
commit 8eb357bc84
2 changed files with 4 additions and 4 deletions

4
src/aclocal.m4 vendored
View file

@ -402,7 +402,7 @@ case "${host_os}" in
PICFLAG='-fPIC -fno-common'
SHARED_LDFLAGS="-dynamiclib -flat_namespace -undefined suppress ${LDFLAGS}"
BUNDLE_LDFLAGS="-bundle ${LDFLAGS}"
ECL_LDRPATH=''
ECL_LDRPATH='-Wl,-rpath,~A'
THREAD_CFLAGS='-D_THREAD_SAFE'
THREAD_LIBS='-lpthread'
# The GMP library has not yet been ported to Intel-OSX
@ -429,7 +429,7 @@ case "${host_os}" in
ECL_GC_DIR=bdwgc
fi
SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
SONAME_LDFLAGS="-Wl,-install_name,@rpath/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
;;
nsk*)
# HP Non-Stop platform

4
src/configure vendored
View file

@ -5062,7 +5062,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
PICFLAG='-fPIC -fno-common'
SHARED_LDFLAGS="-dynamiclib -flat_namespace -undefined suppress ${LDFLAGS}"
BUNDLE_LDFLAGS="-bundle ${LDFLAGS}"
ECL_LDRPATH=''
ECL_LDRPATH='-Wl,-rpath,~A'
THREAD_CFLAGS='-D_THREAD_SAFE'
THREAD_LIBS='-lpthread'
# The GMP library has not yet been ported to Intel-OSX
@ -5089,7 +5089,7 @@ LSP_FEATURES="(cons :android ${LSP_FEATURES})"
ECL_GC_DIR=bdwgc
fi
SONAME="${SHAREDPREFIX}ecl.SOVERSION.${SHAREDEXT}"
SONAME_LDFLAGS="-Wl,-install_name,@libdir\@/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
SONAME_LDFLAGS="-Wl,-install_name,@rpath/SONAME -Wl,-compatibility_version,${PACKAGE_VERSION}"
;;
nsk*)
# HP Non-Stop platform