diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-01-05 23:21:52 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-01-05 23:21:52 +0100 |
| commit | 3c81899718e3429e45381beaaba58d4886a5537c (patch) | |
| tree | 509b9d44cc872ba45df0b3c2afc74e90ca0cc6e4 /nx-X11/config/cf/lnxLib.rules | |
| parent | e13e31f752c0b204f964ee1df272a6b31ce51189 (diff) | |
| parent | 1c1431c0ff41afa8221ea8a1e0d4514746ebbaa3 (diff) | |
| download | nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.tar.gz nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.tar.bz2 nx-libs-3c81899718e3429e45381beaaba58d4886a5537c.zip | |
Merge branch 'Ionic-bugfix/rpath' into 3.6.x
Attributes GH PR #614: https://github.com/ArcticaProject/nx-libs/pull/614
Fixes: ArcticaProject/nx-libs#610
Diffstat (limited to 'nx-X11/config/cf/lnxLib.rules')
| -rw-r--r-- | nx-X11/config/cf/lnxLib.rules | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index e415db8f1..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,-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 @@ -72,15 +79,28 @@ # if LinuxBinUtilsMajorVersion >= 26 # ifdef UseInstalled # if LinuxBinUtilsMajorVersion < 27 -# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH) +# define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH) # endif # else -# define ExtraLoadFlags RpathLoadFlags -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 |