diff options
| author | Joel Kitching <kitching@google.com> | 2019-12-05 15:02:32 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-09 07:51:34 +0000 |
| commit | 7d205000b0ad85c35b724dd5ba71bc648627d826 (patch) | |
| tree | 44d80e6509d094dc9aea27dc8d08d721776ba6e6 | |
| parent | 1ba6d1f87c5d1ae85ef42a3fae30220892ca9c9f (diff) | |
| download | vboot-7d205000b0ad85c35b724dd5ba71bc648627d826.tar.gz | |
vboot: remove static linking support from Makefile
Previously, futility and crossystem needed to be statically
linked. (futility had both futility and futility_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: I8c2b5c5b5aa86bbecb0c264f688dfdac4b19ca7e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1954976
Tested-by: Joel Kitching <kitching@chromium.org>
Commit-Queue: Joel Kitching <kitching@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
| -rw-r--r-- | Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -575,9 +575,6 @@ UTIL_SCRIPTS += \ utility/vbutil_what_keys endif -# These utilities should also provide static linked version (*_s). -UTIL_NAMES_STATIC = - UTIL_NAMES = \ utility/crossystem \ utility/dumpRSAPublicKey \ @@ -594,8 +591,7 @@ LZMA_LIBS = $(shell ${PKG_CONFIG} --libs liblzma) YAML_LIBS = $(shell ${PKG_CONFIG} --libs yaml-0.1) endif -UTIL_BINS_STATIC := $(addsuffix _s,$(addprefix ${BUILD}/,${UTIL_NAMES_STATIC})) -UTIL_BINS = $(addprefix ${BUILD}/,${UTIL_NAMES}) ${UTIL_BINS_STATIC} +UTIL_BINS = $(addprefix ${BUILD}/,${UTIL_NAMES}) ALL_OBJS += $(addsuffix .o,${UTIL_BINS}) @@ -1008,12 +1004,8 @@ cgpt_wrapper_install: cgpt_install ${CGPT_WRAPPER} # These have their own headers too. ${BUILD}/utility/%: INCLUDES += -Iutility/include -${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB} -${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB} - -# Utilities for auto-update toolkits must be statically linked. -${UTIL_BINS_STATIC}: LDFLAGS += -static - +${UTIL_BINS}: ${UTILLIB} +${UTIL_BINS}: LIBS = ${UTILLIB} .PHONY: utils utils: ${UTIL_BINS} ${UTIL_SCRIPTS} @@ -1149,7 +1141,6 @@ ${UTIL_DEFAULTS}: # Some utilities need external crypto functions CRYPTO_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto) -CRYPTO_STATIC_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto --static) ${BUILD}/utility/dumpRSAPublicKey: LDLIBS += ${CRYPTO_LIBS} ${BUILD}/utility/pad_digest_utility: LDLIBS += ${CRYPTO_LIBS} |