diff options
| author | Gerald Carter <jerry@samba.org> | 2007-08-28 15:12:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:30:17 -0500 |
| commit | 51514b5d632fc06ae44885b7a78cb3062decc500 (patch) | |
| tree | e696fdc55751dab6aeedaf8ad9650a7497a9bd0b | |
| parent | 4b6713e7cc43ecc3637203884b22efeb839407c3 (diff) | |
| download | samba-51514b5d632fc06ae44885b7a78cb3062decc500.tar.gz samba-51514b5d632fc06ae44885b7a78cb3062decc500.tar.bz2 samba-51514b5d632fc06ae44885b7a78cb3062decc500.zip | |
r24745: Merge Simo's shared lib build fix from svn r22842 that was lost
somehow. Don't include the PIE_FLAGS when building shared libs.
(This used to be commit 22f2f1e033a7a6877c6b8a0847179728a408af85)
| -rw-r--r-- | source3/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 4e67f80c17..da5d2c0e04 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -35,9 +35,9 @@ CFLAGS=@CFLAGS@ CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@ EXEEXT=@EXEEXT@ -LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ AR=@AR@ LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ +LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ # The MODULE_EXPORTS variable conatins the platform-specific linker flags # needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules. @@ -1354,7 +1354,7 @@ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ bin/libaddns.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBADDNS_OBJ) @echo Linking libaddns shared library $@ - @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LDFLAGS) $(LIBS) \ + @$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \ $(KRB5LIBS) $(UUID_LIBS)\ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1364,7 +1364,7 @@ bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ) bin/libsmbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) @echo Linking libsmbclient shared library $@ - @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LDFLAGS) $(LIBS) \ + @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) @@ -1374,7 +1374,7 @@ bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) bin/libsmbsharemodes.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) @echo Linking libsmbsharemodes shared library $@ - @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LDFLAGS) $(LIBS) \ + @$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) $(LIBS) \ $(KRB5LIBS) $(LDAP_LIBS) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) |