diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-12-29 21:44:56 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-30 03:36:11 +0100 |
commit | ffc09a73d3fad32f3765caf62546a3e7cc5b9cd8 (patch) | |
tree | e323cc999612bcdebc977fdcb0ee6d5769f5969e /nx-X11/config/cf/gnuLib.rules | |
parent | 44f8c424e70311283b274c3e9fddbd7ca928f003 (diff) | |
download | nx-libs-ffc09a73d3fad32f3765caf62546a3e7cc5b9cd8.tar.gz nx-libs-ffc09a73d3fad32f3765caf62546a3e7cc5b9cd8.tar.bz2 nx-libs-ffc09a73d3fad32f3765caf62546a3e7cc5b9cd8.zip |
nx-X11: build programs with a temporary RPATH/RUNPATH value and a relinked version with the system location.
While the install target explicitly installs the relinked
system-location version of a program, we do not actually use this.
Currently, we copy nxagent directly out of the build root.
Diffstat (limited to 'nx-X11/config/cf/gnuLib.rules')
-rw-r--r-- | nx-X11/config/cf/gnuLib.rules | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/nx-X11/config/cf/gnuLib.rules b/nx-X11/config/cf/gnuLib.rules index fe0e82dc0..5dee4280b 100644 --- a/nx-X11/config/cf/gnuLib.rules +++ b/nx-X11/config/cf/gnuLib.rules @@ -40,11 +40,18 @@ XCOMM XXX To rpath or not to rpath... #endif #ifndef RpathLoadFlags #if UseRpath -#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH) +#define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=\$$ORIGIN/$(BUILDLIBDIR) #else #define RpathLoadFlags /**/ #endif #endif +#ifndef RpathInstallLoadFlags +#if UseRpath +#define RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH) +#else +#define RpathInstallLoadFlags /**/ +#endif +#endif #ifndef LibraryRpathLoadFlags #define LibraryRpathLoadFlags RpathLoadFlags #endif @@ -62,7 +69,15 @@ XCOMM XXX To rpath or not to rpath... XCOMM XXX Maybe superfluous. #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) #else -#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR) +#define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR) +#endif +#endif +#ifndef ExtraInstallLoadFlags +#ifdef UseInstalled +XCOMM XXX Maybe superfluous. +#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH) +#else +#define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=\$$ORIGIN/$(BUILDLIBDIR) #endif #endif |