aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2018-02-25 04:35:07 +0100
committerMihai Moldovan <ionic@ionic.de>2018-02-25 04:35:07 +0100
commit06c14b83184f30498e27fed435d38d6e33338f2c (patch)
tree0ef17bbfbf2629afa383c97deb4c0080607382c1
parent990e61cc8931be57bda5526a69e6e204e1ee2dda (diff)
downloadnx-libs-06c14b83184f30498e27fed435d38d6e33338f2c.tar.gz
nx-libs-06c14b83184f30498e27fed435d38d6e33338f2c.tar.bz2
nx-libs-06c14b83184f30498e27fed435d38d6e33338f2c.zip
nxproxy/{configure.ac,src/Makefile.am}: only enable new ELF dtags if target system actually is ELF-based.
Fixes: ArcticaProject/nx-libs#661
-rw-r--r--nxproxy/configure.ac2
-rw-r--r--nxproxy/src/Makefile.am5
2 files changed, 7 insertions, 0 deletions
diff --git a/nxproxy/configure.ac b/nxproxy/configure.ac
index a1dcab442..6a0a41cbb 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 ecf2a0486..fbe52cbf8 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) \