From 990e61cc8931be57bda5526a69e6e204e1ee2dda Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sun, 25 Feb 2018 04:33:52 +0100 Subject: nxcompshad/{configure.ac,src/Makefile.am}: only enable new ELF dtags if target system actually is ELF-based. --- nxcompshad/configure.ac | 2 ++ nxcompshad/src/Makefile.am | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nxcompshad/configure.ac b/nxcompshad/configure.ac index 3113918b2..181e43a04 100644 --- a/nxcompshad/configure.ac +++ b/nxcompshad/configure.ac @@ -47,6 +47,8 @@ AC_LANG([C++]) NX_COMPILER_BRAND NX_DEFAULT_OPTIONS +NX_TARGET_USE_ELF + AC_ARG_ENABLE([cxx11], [AS_HELP_STRING([--enable-cxx11], [enable optional features requiring C++11 support (disabled by default)])], diff --git a/nxcompshad/src/Makefile.am b/nxcompshad/src/Makefile.am index f7beac86e..4580149ad 100644 --- a/nxcompshad/src/Makefile.am +++ b/nxcompshad/src/Makefile.am @@ -39,10 +39,14 @@ AM_CPPFLAGS = \ libXcompshad_la_LDFLAGS = \ -version-number @LT_COMPSHAD_VERSION@ -no-undefined \ - -Wl,--enable-new-dtags \ -R '$(libdir)/nx/X11' \ $(NULL) +if TARGET_ELF +libXcompshad_la_LDFLAGS += \ + -Wl,--enable-new-dtags \ +endif TARGET_ELF + libXcompshadincludedir = $(includedir)/nx libXcompshadinclude_HEADERS = \ $(top_srcdir)/include/Shadow.h \ -- cgit v1.2.3