[X2Go-Commits] [nx-libs] 04/38: nxproxy/{configure.ac, src/Makefile.am}: only enable new ELF dtags if target system actually is ELF-based.

git-admin at x2go.org git-admin at x2go.org
Mon Feb 26 06:44:58 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 06c14b83184f30498e27fed435d38d6e33338f2c
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Feb 25 04:35:07 2018 +0100

    nxproxy/{configure.ac,src/Makefile.am}: only enable new ELF dtags if target system actually is ELF-based.
    
    Fixes: ArcticaProject/nx-libs#661
---
 nxproxy/configure.ac    | 2 ++
 nxproxy/src/Makefile.am | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac
index a1dcab4..6a0a41c 100644
--- a/nxproxy/configure.ac
+++ b/nxproxy/configure.ac
@@ -26,6 +26,8 @@ AC_LANG([C])
 NX_COMPILER_BRAND
 NX_DEFAULT_OPTIONS
 
+NX_TARGET_USE_ELF
+
 dnl This is a workaround for a nasty libtool bug.
 dnl We actually compile libXcomp with pthread support, but libtool uses g++ ... -nostdlib ... -pthread
 dnl on Linux. -nostdlib causes -pthread to be ignored.
diff --git a/nxproxy/src/Makefile.am b/nxproxy/src/Makefile.am
index ecf2a04..fbe52cb 100644
--- a/nxproxy/src/Makefile.am
+++ b/nxproxy/src/Makefile.am
@@ -15,8 +15,13 @@ nxproxy_LDADD =						\
 
 nxproxy_LDFLAGS =					\
     $(PTHREAD_LDFLAGS)					\
+    $(NULL)
+
+if TARGET_ELF
+nxproxy_LDFLAGS +=					\
     -Wl,--enable-new-dtags				\
     $(NULL)
+endif TARGET_ELF
 
 nxproxy_CFLAGS =					\
     $(BASE_CFLAGS)					\

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list