Skip to content

N
nx-libs
Commit 4b153f5b authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

nx-X11/config/cf/{gnu,lnx}Lib.rules: enable new ELF dtags to force RUNPATH creation for nxagent.

parent b13bf675
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
nx-X11/config/cf/gnuLib.rules
View file @ 4b153f5b
...@@ -40,7 +40,7 @@ XCOMM XXX To rpath or not to rpath... ...@@ -40,7 +40,7 @@ XCOMM XXX To rpath or not to rpath...
#endif #endif
#ifndef RpathLoadFlags #ifndef RpathLoadFlags
#if UseRpath #if UseRpath
#define RpathLoadFlags -Wl,-rpath=$(USRLIBDIRPATH) #define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath=$(USRLIBDIRPATH)
#else #else
#define RpathLoadFlags /**/ #define RpathLoadFlags /**/
#endif #endif
...@@ -60,9 +60,9 @@ XCOMM XXX To rpath or not to rpath... ...@@ -60,9 +60,9 @@ XCOMM XXX To rpath or not to rpath...
#ifndef ExtraLoadFlags #ifndef ExtraLoadFlags
#ifdef UseInstalled #ifdef UseInstalled
XCOMM XXX Maybe superfluous. XCOMM XXX Maybe superfluous.
#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(USRLIBDIRPATH) #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(USRLIBDIRPATH)
#else #else
#define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link=$(BUILDLIBDIR) #define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link=$(BUILDLIBDIR)
#endif #endif
#endif #endif
......
nx-X11/config/cf/lnxLib.rules
View file @ 4b153f5b
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
# endif # endif
#ifndef RpathLoadFlags #ifndef RpathLoadFlags
#if UseRpath #if UseRpath
#define RpathLoadFlags -Wl,-rpath,$(USRLIBDIRPATH) #define RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath,$(USRLIBDIRPATH)
#else #else
#define RpathLoadFlags /**/ #define RpathLoadFlags /**/
#endif #endif
...@@ -72,10 +72,10 @@ ...@@ -72,10 +72,10 @@
# if LinuxBinUtilsMajorVersion >= 26 # if LinuxBinUtilsMajorVersion >= 26
# ifdef UseInstalled # ifdef UseInstalled
# if LinuxBinUtilsMajorVersion < 27 # if LinuxBinUtilsMajorVersion < 27
# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH) # define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(USRLIBDIRPATH)
# endif # endif
# else # else
# define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR) # define ExtraLoadFlags RpathLoadFlags -Wl,--enable-new-dtags -Wl,-rpath-link,$(BUILDLIBDIR)
# endif # endif
# else # else
# define ExtraLoadFlags RpathLoadFlags # define ExtraLoadFlags RpathLoadFlags
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment