summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-12-10 17:25:03 +0800
committerCommit Bot <commit-bot@chromium.org>2019-12-11 16:17:34 +0000
commita914db93e24fc5f5d703430c310fbf4aa764eea1 (patch)
treec13f6b433d908c48eeadad3b002f06727e43b7f2
parent569f68c1db7dc6112e05a580f01a6215c0c15ffe (diff)
downloadvboot-a914db93e24fc5f5d703430c310fbf4aa764eea1.tar.gz
vboot: remove support for _s suffixed binaries in Makefile
This suffix was used for static files, e.g. futility_s and crossystem_s. Since there's no longer any need to statically link any binaries built by vboot_reference, remove this support from the Makefile. BUG=b:124141368, chromium:765499 TEST=make clean && make runtests BRANCH=none Change-Id: Ia333c86e3466311b96bb111bb7e9a92789379792 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1960185 Tested-by: Joel Kitching <kitching@chromium.org> Auto-Submit: Joel Kitching <kitching@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org> Commit-Queue: Joel Kitching <kitching@chromium.org>
-rw-r--r--Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 948df3dd..471ba922 100644
--- a/Makefile
+++ b/Makefile
@@ -1111,10 +1111,6 @@ ${FUZZ_TEST_BINS}: LDFLAGS += -fsanitize=fuzzer
# Generic build rules. LIBS and OBJS can be overridden to tweak the generic
# rules for specific targets.
-${BUILD}/%_s: ${BUILD}/%.o ${OBJS} ${LIBS}
- @${PRINTF} " LD (static) $(subst ${BUILD}/,,$@)\n"
- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $< ${OBJS} ${LIBS} ${LDLIBS}
-
${BUILD}/%: ${BUILD}/%.o ${OBJS} ${LIBS}
@${PRINTF} " LD $(subst ${BUILD}/,,$@)\n"
${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $< ${OBJS} ${LIBS} ${LDLIBS}