diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-11-16 11:27:48 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:45:32 +0100 |
| commit | 7b7c84c02c533c2a75321c0e6657c2b67508c7e8 (patch) | |
| tree | fa1b53bf7eba5c9c7ad02afeddb0d5273365452f | |
| parent | 24f84f70b976714784c3d85822659edda5ecf912 (diff) | |
| download | samba-7b7c84c02c533c2a75321c0e6657c2b67508c7e8.tar.gz samba-7b7c84c02c533c2a75321c0e6657c2b67508c7e8.tar.bz2 samba-7b7c84c02c533c2a75321c0e6657c2b67508c7e8.zip | |
r25996: build: rename LD -> BNLD and LDFLAGS -> BNLD_FLAGS
metze
(This used to be commit fa795c88e2661a4398d2a9ded6ce486de4c45076)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 6 | ||||
| -rw-r--r-- | source4/main.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index a69b013174..08c237c4da 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -190,8 +190,8 @@ PICFLAG=$self->{config}->{PICFLAG} INSTALL_LINK_FLAGS=$extra_link_flags -LD=$self->{config}->{LD} -LDFLAGS=$self->{config}->{LDFLAGS} -L$libdir +BNLD=$self->{config}->{LD} +BNLD_FLAGS=$self->{config}->{LDFLAGS} -L$libdir STLD=$self->{config}->{STLD} STLD_FLAGS=$self->{config}->{STLD_FLAGS} @@ -511,7 +511,7 @@ __EOD__ ); } else { $self->output(<< "__EOD__" - \@\$(LD) \$(LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ + \@\$(BNLD) \$(BNLD_FLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) __EOD__ diff --git a/source4/main.mk b/source4/main.mk index 6a98160ac1..a4c9764eb5 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -77,8 +77,8 @@ showflags: @echo ' CC = $(CC)' @echo ' CFLAGS = $(CFLAGS)' @echo ' PICFLAG = $(PICFLAG)' - @echo ' LD = $(LD)' - @echo ' LDFLAGS = $(LDFLAGS)' + @echo ' BNLD = $(BNLD)' + @echo ' BNLD_FLAGS = $(BNLD_FLAGS)' @echo ' STLD = $(STLD)' @echo ' STLD_FLAGS = $(STLD_FLAGS)' @echo ' SHLD = $(SHLD)' |