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/programs/Xserver | |
| 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/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/Imakefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index efab0de85..f6dd11521 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -400,7 +400,7 @@ nxagent_static: nxagent else exit 0; fi $(CCLINK) -o nxagent_static -static $(LDOPTIONS) $(NXAGENTOBJS) \ $(LIBCWRAPPER) $(NXCOMPEXT) $(NXAGENTLIBS) $(LOADABLEEXTS) $(LDLIBS) \ - $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS) $(EXTRA_LOAD_FLAGS) + $(NXCOMPEXTSYSLIBS) $(NXAGENTSYSLIBS) $(EXTRA_INSTALL_LOAD_FLAGS) /* * Hard coded target to build a static nxagent server except for libX11 and libXext. @@ -411,7 +411,7 @@ nxagent_static_nolibs: nxagent else exit 0; fi $(CCLINK) -o nxagent_static_nolibs -Wl,-Bstatic $(LDOPTIONS) $(NXAGENTOBJS) \ $(NXAGENTLIBS) $(LOADABLEEXTS) $(LIBCWRAPPER) $(LDLIBS) \ - $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_LOAD_FLAGS) + $(LDPRELIBS) $(SYSLIBS) -Wl,-Bdynamic -lNX_X11 -lXext $(EXTRA_INSTALL_LOAD_FLAGS) #endif /* NXAgentServer */ #if defined(NXWinServer) && NXWinServer |