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>
diff --git a/Makefile b/Makefile
index 05b94c6..2116741 100644
--- a/Makefile
+++ b/Makefile
@@ -575,9 +575,6 @@
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 @@
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 @@
# 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 @@
# 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}
