New patch to review for coreboot: 880bb6a cbfstool/Makefile*: Use `LDFLAGS` instead of `LINKFLAGS`

[Paul Menzel]

Paul Menzel ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10064

-gerrit

commit 880bb6a26741bb0e32fa7303f721351786691902
Author: Paul Menzel 
Date:   Sun May 3 09:35:32 2015 +0200

cbfstool/Makefile*: Use `LDFLAGS` instead of `LINKFLAGS`

Commit 0e53931f (cbfstool: Clean up in preparation for adding new
    files) split out the flags and introduced the variable `LINKFLAGS`.
    Rename it to `LDFLAGS` which is more commonly used.

Change-Id: Ib6299f8ef5cf30dbe05bfae36f30ae4371f0a738
    Signed-off-by: Paul Menzel 
---
 util/cbfstool/Makefile     | 4 ++--
 util/cbfstool/Makefile.inc | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 9595773..86338db 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Werror -Wall -Wextra
 CFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 CFLAGS += -Wstrict-prototypes -Wwrite-strings
 CPPFLAGS += -D_POSIX_C_SOURCE=200809L # strdup() from string.h
-LINKFLAGS += -g3
+LDFLAGS += -g3

CBFSTOOL_BINARY:=$(obj)/cbfstool
 CBFSTOOL_COMMON:=common.o cbfs_image.o compress.o fit.o
@@ -30,7 +30,7 @@ all: .dependencies $(CBFSTOOL_BINARY) $(RMODTOOL_BINARY)

$(obj)/%: $(obj)/%.o
    mkdir -p $(dir $@)
-	$(HOSTCC) $(LINKFLAGS) -o $@ $^ $(LDLIBS)
+	$(HOSTCC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 $(obj)/%.o: %.c
    mkdir -p $(dir $@)
    $(HOSTCC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc
index a846e99..5bf0b70 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.inc
@@ -28,7 +28,7 @@ TOOLCFLAGS ?= -std=c99 -Werror -Wall -Wextra
 TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow
 TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings
 TOOLCPPFLAGS ?= -D_POSIX_C_SOURCE=200809L # strdup() from string.h
-TOOLLINKFLAGS ?=
+TOOLLDFLAGS ?=

ifeq ($(shell uname -s | cut -c-7 2>/dev/null), MINGW32)
 TOOLFLAGS+=-mno-ms-bitfields
@@ -48,11 +48,11 @@ $(objutil)/cbfstool/%.o: $(top)/util/cbfstool/lzma/C/%.c

$(objutil)/cbfstool/cbfstool: $(addprefix $(objutil)/cbfstool/,$(cbfsobj))
    printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
-	$(HOSTCC) $(TOOLLINKFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(cbfsobj))
+	$(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(cbfsobj))

$(objutil)/cbfstool/rmodtool: $(addprefix $(objutil)/cbfstool/,$(rmodobj))
    printf "    HOSTCC     $(subst $(objutil)/,,$(@)) (link)\n"
-	$(HOSTCC) $(TOOLLINKFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(rmodobj))
+	$(HOSTCC) $(TOOLLDFLAGS) -o $@ $(addprefix $(objutil)/cbfstool/,$(rmodobj))

# Tolerate lzma sdk warnings
 $(objutil)/cbfstool/LzmaEnc.o: TOOLCFLAGS += -Wno-sign-compare -Wno-cast-qual