r25996: build: rename LD -> BNLD and LDFLAGS -> BNLD_FLAGS

metze
(This used to be commit fa795c88e2661a4398d2a9ded6ce486de4c45076)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a69b0131745f99796118ff44ebea2682439be608..08c237c4da4b5a8cee122317b1069a1118a99830 100644 (file)
--- 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 6a98160ac154a64713e4f81404f3d16a85727e60..a4c9764eb5ba307380e235b65b60e6f36a487102 100644 (file)
--- 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)'