Commit ad7e12ed authored by Clemens Lang's avatar Clemens Lang Committed by Mihai Moldovan

nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.

parent 5464a6db
...@@ -14,6 +14,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low ...@@ -14,6 +14,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
[ Clemens Lang ] [ Clemens Lang ]
* Use path discovery for finding makedepend. Remove old cruft. * Use path discovery for finding makedepend. Remove old cruft.
* Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
-- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100 -- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100
......
...@@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then ...@@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then
fi fi
dnl Under Darwin we don't have support for -soname option and dnl Under Darwin we don't have support for -soname option and
dnl we need the -bundle flag. Under Solaris, instead, we need dnl we need the -dynamiclib flag. Under Solaris, instead, we need
dnl the options -G -h. dnl the options -G -h.
if test "$DARWIN" = yes; then if test "$DARWIN" = yes; then
LDFLAGS="$LDFLAGS -bundle" LDFLAGS="$LDFLAGS -dynamiclib"
elif test "$SUN" = yes; then elif test "$SUN" = yes; then
LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)" LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
else else
......
...@@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then ...@@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then
fi fi
dnl Under Darwin we don't have support for -soname option and dnl Under Darwin we don't have support for -soname option and
dnl we need the -bundle flag. Under Solaris, instead, we need dnl we need the -dynamiclib flag. Under Solaris, instead, we need
dnl the options -G -h. dnl the options -G -h.
if test "$DARWIN" = yes; then if test "$DARWIN" = yes; then
LDFLAGS="$LDFLAGS -bundle" LDFLAGS="$LDFLAGS -dynamiclib"
elif test "$SUN" = yes; then elif test "$SUN" = yes; then
LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)" LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment