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/lnxLib.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/lnxLib.rules')
| -rw-r--r-- | nx-X11/config/cf/lnxLib.rules | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index 76fcb395c..5b89cdd96 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -51,11 +51,18 @@ # 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 @@ -75,12 +82,25 @@ # define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) # endif # 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 # else # define ExtraLoadFlags RpathLoadFlags # endif # endif +# ifndef ExtraInstallLoadFlags +# if LinuxBinUtilsMajorVersion >= 26 +# ifdef UseInstalled +# if LinuxBinUtilsMajorVersion < 27 +# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) +# endif +# else +# define ExtraInstallLoadFlags RpathInstallLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,\$$ORIGIN/$(BUILDLIBDIR) +# endif +# else +# define ExtraInstallLoadFlags RpathInstallLoadFlags +# endif +# endif # ifndef HardCodeLibdirFlag # define HardCodeLibdirFlag RpathLoadFlags # endif |