summaryrefslogtreecommitdiff
path: root/cgpt
diff options
context:
space:
mode:
authorMike Frysinger <vapier@chromium.org>2012-06-07 12:18:05 -0400
committerGerrit <chrome-bot@google.com>2012-06-18 18:15:38 -0700
commitd7f8f3574c31dbbd506619e8f68eecf5b39ebf54 (patch)
tree2d9d53eef8c2e7a82084704a9bb339cf9de18258 /cgpt
parent121f3db2d586ac730318455778a94fc3e9cd294c (diff)
downloadvboot-d7f8f3574c31dbbd506619e8f68eecf5b39ebf54.tar.gz
respect LDFLAGS settingsrelease-R21-2465.B
Libraries go into $LDLIBS while linker flags go into $LDFLAGS. Also make sure the utility subdir respects the env $LDFLAGS so that we can do things like `make LDFLAGS=-static` and get static binaries. BUG=None TEST=`emerge vboot_reference` still works TEST=`emerge-arm-generic vboot_reference` still works Change-Id: I989a21bc559bc6d471bc33c057c708bda2eda67e Reviewed-on: https://gerrit.chromium.org/gerrit/24728 Reviewed-by: Bill Richardson <wfrichar@chromium.org> Commit-Ready: Mike Frysinger <vapier@chromium.org> Tested-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'cgpt')
-rw-r--r--cgpt/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/cgpt/Makefile b/cgpt/Makefile
index ae9aac1c..546656d3 100644
--- a/cgpt/Makefile
+++ b/cgpt/Makefile
@@ -2,11 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-LDFLAGS += -luuid -static
BUILD_ROOT := ${BUILD}/cgpt
INCLUDES = -I$(FWDIR)/lib/cgptlib/include -I$(FWDIR)/include
LIBS = ${HOSTLIB}
+LDLIBS += -luuid
+LDFLAGS += -static
DESTDIR ?= /usr/bin
@@ -61,7 +62,7 @@ $(LIB_CGPT_CC): $(LIB_CGPT_CC_OBJS)
ar qc $@ $^
$(PROGNAME): $(ALL_OBJS) $(LIBS)
- $(CC) -o $(PROGNAME) $(CFLAGS) $^ $(LDFLAGS)
+ $(CC) -o $(PROGNAME) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS)
install: $(PROGNAME)
mkdir -p $(DESTDIR)