diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-25 15:03:52 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-02-25 15:03:52 +0100 |
commit | a653aed4c0f0c83185fca8076559ae10553ec11f (patch) | |
tree | dc732ad657d21942d1d964763ab301a2672299f3 /nxproxy | |
parent | dd1ae1769858b7467bd4cde2b83b1cda8653c983 (diff) | |
parent | 06c14b83184f30498e27fed435d38d6e33338f2c (diff) | |
download | nx-libs-a653aed4c0f0c83185fca8076559ae10553ec11f.tar.gz nx-libs-a653aed4c0f0c83185fca8076559ae10553ec11f.tar.bz2 nx-libs-a653aed4c0f0c83185fca8076559ae10553ec11f.zip |
Merge branch 'Ionic-bugfix/FTBFS-non-ELF' into 3.6.x
Attributes GH PR #663: https://github.com/ArcticaProject/nx-libs/pull/663
Diffstat (limited to 'nxproxy')
-rw-r--r-- | nxproxy/configure.ac | 2 | ||||
-rw-r--r-- | nxproxy/src/Makefile.am | 5 |
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) \ |