diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-11-07 16:14:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:19 -0500 |
| commit | 640047e947f57d94d074d8ad9b2cc99ff0f366e3 (patch) | |
| tree | 8fbe6cc786ee960c2035b66cb329a00dd4df34e2 | |
| parent | 9dfa85d89bf4ca0c22a16abc8a45fe00e62a94ef (diff) | |
| download | samba-640047e947f57d94d074d8ad9b2cc99ff0f366e3.tar.gz samba-640047e947f57d94d074d8ad9b2cc99ff0f366e3.tar.bz2 samba-640047e947f57d94d074d8ad9b2cc99ff0f366e3.zip | |
r19625: not all linkers like -Wl,rpath-link, so don't use it till we have configure checks
and working shared libraries
metze
(This used to be commit 25376f748c6f2da48a8bf7e0aa0d59befb9db4f3)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index f763ccbc18..e388308f85 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -134,8 +134,6 @@ PICFLAG=$self->{config}->{PICFLAG} HOSTCC=$self->{config}->{HOSTCC} HOSTCC_CFLAGS=-D_SAMBA_HOSTCC_ $self->{config}->{CFLAGS} \$(CPPFLAGS) -INSTALL_LINK_FLAGS=-Wl,-rpath-link,\$(builddir)/bin/shared - LD=$self->{config}->{LD} LDFLAGS=$self->{config}->{LDFLAGS} -L$libdir @@ -282,7 +280,7 @@ __EOD__ $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) $init_obj \@echo Linking \$\@ \@mkdir -p $ctx->{SHAREDDIR} - \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ + \@\$(SHLD) \$(SHLD_FLAGS) -o \$\@ \\ \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \\ \$($ctx->{TYPE}_$ctx->{NAME}\_FULL_OBJ_LIST) $soarg \\ $init_obj $singlesoarg @@ -371,8 +369,7 @@ sub Binary($$) $self->output(<< "__EOD__" $installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ - \@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ - \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) + \@\$(LD) \$(LDFLAGS) -o \$\@ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ ); |