diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-06 15:01:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:17:47 -0500 |
| commit | c8295a7d2f68b5f2733b947ee2dbcd4358d0bf37 (patch) | |
| tree | a5f2fc1e8feb7707435fb2d2776124b93da527b1 /source4/build/smb_build | |
| parent | 21ef15d703557cfa8c71b72df35c8d485b3c2ab0 (diff) | |
| download | samba-c8295a7d2f68b5f2733b947ee2dbcd4358d0bf37.tar.gz samba-c8295a7d2f68b5f2733b947ee2dbcd4358d0bf37.tar.bz2 samba-c8295a7d2f68b5f2733b947ee2dbcd4358d0bf37.zip | |
r18181: use:
CC and CFLAGS
LD and LDFLAGS
STLD and STLD_FLAGS
SHLD and SHLD_FLAGS
all controled by configure
and import the values from samba3 which are more recent
metze
(This used to be commit 5e59153735102df6fae2eaaac6a7c3db86c95f8f)
Diffstat (limited to 'source4/build/smb_build')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index fae5a4761c..5309adea1d 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -139,13 +139,12 @@ INSTALL_LINK_FLAGS=$devld_install LD=$self->{config}->{LD} LDFLAGS=$self->{config}->{LDFLAGS} -L\$(builddir)/bin -STLD=$self->{config}->{AR} -STLD_FLAGS=-rc +STLD=$self->{config}->{STLD} +STLD_FLAGS=$self->{config}->{STLD_FLAGS} -SHLD=$self->{config}->{CC} -SHLD_FLAGS=$self->{config}->{LDSHFLAGS} $self->{config}->{LDFLAGS} -L\$(builddir)/bin +SHLD=$self->{config}->{SHLD} +SHLD_FLAGS=$self->{config}->{SHLD_FLAGS} -L\$(builddir)/bin SHLIBEXT=$self->{config}->{SHLIBEXT} -DYNEXP=$self->{config}->{DYNEXP} XSLTPROC=$self->{config}->{XSLTPROC} @@ -393,7 +392,7 @@ sub Binary($$) # bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ - \@\$(CC) \$(DYNEXP) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\ + \@\$(LD) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ @@ -403,7 +402,7 @@ __EOD__ $self->output(<< "__EOD__" $installdir/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_FULL_OBJ_LIST) \@echo Linking \$\@ - \@\$(CC) \$(DYNEXP) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ + \@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ |