diff options
| author | Brian Norris <briannorris@chromium.org> | 2020-07-05 12:07:30 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-07-10 20:39:06 +0000 |
| commit | d46f93ed581a9e3ddc9ab9cdb47a0f2917a7f422 (patch) | |
| tree | 3bcb3ed78ef310216061f7eb5fc3a4ce1c0bc14e | |
| parent | 28eededf643cc3cb278e8aa276b9c97e527dabdb (diff) | |
| download | vboot-d46f93ed581a9e3ddc9ab9cdb47a0f2917a7f422.tar.gz | |
Makefile: fixup linker flags usage
These are linker commands, not compiler (even though we use CC as LD).
Use LDLIBS consistently, and don't provide CFLAGS.
This improves clarity and consistency, even if it still doesn't truly
separate CC and LD.
BUG=none
TEST=build
Cq-Depend: chromium:2285152
Signed-off-by: Brian Norris <briannorris@chromium.org>
Change-Id: Ie54fafdccab5b9c942fc2cc38009c75f3d46a5e4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2281964
Reviewed-by: Joel Kitching <kitching@chromium.org>
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -937,7 +937,7 @@ cgpt_wrapper: ${CGPT_WRAPPER} ${CGPT_WRAPPER}: ${CGPT_WRAPPER_OBJS} ${UTILLIB} @$(PRINTF) " LD $(subst ${BUILD}/,,$@)\n" - ${Q}${LD} -o ${CGPT_WRAPPER} ${CFLAGS} $^ + ${Q}${LD} -o ${CGPT_WRAPPER} ${LDFLAGS} $^ ${LDLIBS} .PHONY: cgpt cgpt: ${CGPT} ${CGPT_WRAPPER} @@ -946,7 +946,7 @@ ${CGPT}: LDLIBS += -luuid ${CGPT}: ${CGPT_OBJS} ${UTILLIB} @${PRINTF} " LDcgpt $(subst ${BUILD}/,,$@)\n" - ${Q}${LD} -o ${CGPT} ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + ${Q}${LD} -o ${CGPT} ${LDFLAGS} $^ ${LDLIBS} .PHONY: cgpt_install cgpt_install: ${CGPT} @@ -1018,7 +1018,7 @@ FUTIL_LIBS = ${CRYPTO_LIBS} ${LIBZIP_LIBS} ${FUTIL_BIN}: LDLIBS += ${FUTIL_LIBS} ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB} ${FWLIB} @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" - ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS} + ${Q}${LD} -o $@ ${LDFLAGS} $^ ${LDLIBS} .PHONY: futil_install futil_install: ${FUTIL_BIN} @@ -1089,7 +1089,7 @@ ${FUZZ_TEST_BINS}: LDFLAGS += -fsanitize=fuzzer ${BUILD}/%: ${BUILD}/%.o ${OBJS} ${LIBS} @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n" - ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $< ${OBJS} ${LIBS} ${LDLIBS} + ${Q}${LD} -o $@ ${LDFLAGS} $< ${OBJS} ${LIBS} ${LDLIBS} ${BUILD}/%.o: %.c @${PRINTF} " CC $(subst ${BUILD}/,,$@)\n" @@ -1129,7 +1129,7 @@ ${BUILD}/tests/hmac_test: LDLIBS += ${CRYPTO_LIBS} ${TEST21_BINS}: LDLIBS += ${CRYPTO_LIBS} # Allow multiple definitions, so tests can mock functions from other libraries -${BUILD}/tests/%: CFLAGS += -Xlinker --allow-multiple-definition +${BUILD}/tests/%: LDFLAGS += -Xlinker --allow-multiple-definition ${BUILD}/tests/%: LDLIBS += -lrt -luuid ${BUILD}/tests/%: LIBS += ${TESTLIB} |