diff options
| author | Michael Adam <obnox@samba.org> | 2008-03-06 17:49:07 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-03-06 18:03:56 +0100 |
| commit | bdee4a5cb30adf3f24068b25d295c48b0ab4a890 (patch) | |
| tree | 24d7e4792a853bb26e100c0d42f7d1cac9a23d30 /source3/Makefile.in | |
| parent | 65a73ff0ec597b25611457e74c40ad28824a0fb2 (diff) | |
| download | samba-bdee4a5cb30adf3f24068b25d295c48b0ab4a890.tar.gz samba-bdee4a5cb30adf3f24068b25d295c48b0ab4a890.tar.bz2 samba-bdee4a5cb30adf3f24068b25d295c48b0ab4a890.zip | |
Revert "Build: Add an rpath of $(LIBDIR) to binary targets."
This reverts commit 3a0f781352f364ce625a35ffd78257b27d984c47.
This needs more thought.
Setting RPATH like this does not work on all supported
platforms (Linux, Solaris and AIX seem to work, HP-UX,
Tru64 and MacOS don't, MacOS doesn't even seem to have
an rpath at all prior to 10.4).
What is more, rpath also has some bad effects (when
updating libraries, e.g.), so it should not be set
unconditionally.
I will come up with a confiugure mechanism to control this.
For now, just use the LDFLAGS environment variable if
you want to use an rpath.
Sorry for any inconveniences.
Michael
(This used to be commit 6850dc242b010bdcef5e427e51be04201f55b7f3)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 9523b8ce98..7dfa312066 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -42,8 +42,8 @@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@ EXEEXT=@EXEEXT@ AR=@AR@ -LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ -Wl,-R,$(LIBDIR) -LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ -Wl,-R,$(LIBDIR) +LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ +LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ AWK=@AWK@ |