diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2012-07-25 15:11:54 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-07-25 04:16:46 -0700 |
| commit | 6008fb4d318ecf6737efc90f6b9757c0abeacab0 (patch) | |
| tree | eb8982a69fa68e09d8c4dd220144249c2956aa22 | |
| parent | 1a72ad60d7237a778a4e9b3e075cdc3451895c9f (diff) | |
| download | vboot-6008fb4d318ecf6737efc90f6b9757c0abeacab0.tar.gz | |
utility: Change autoupdate toolkits to statically linked.
Utilities shared by auto update programs (ex, firmware updater) must be
statically linked.
BUG=chrome-os-partner:11630
TEST=emerge-link vboot_reference
Change-Id: I74f7ad9f365005624f55cc3fcfc8dc31de0d69c2
Reviewed-on: https://gerrit.chromium.org/gerrit/28365
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Che-Liang Chiou <clchiou@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
| -rw-r--r-- | utility/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/utility/Makefile b/utility/Makefile index 81918813..783b1735 100644 --- a/utility/Makefile +++ b/utility/Makefile @@ -18,10 +18,15 @@ BUILD_ROOT = ${BUILD}/utility DESTDIR ?= /usr/bin -TARGET_NAMES = crossystem \ +# Special flags for auto-update toolkits (must be statically linked). +AU_LDFLAGS = $(LDFLAGS) -static +AU_TARGETS = crossystem \ + dump_fmap \ + gbb_utility + +TARGET_NAMES = $(AU_TARGETS) \ dumpRSAPublicKey \ dump_kernel_config \ - gbb_utility \ load_kernel_test \ pad_digest_utility \ signature_digest_utility \ @@ -36,7 +41,6 @@ TARGET_NAMES = crossystem \ verify_data \ dev_make_keypair \ dev_sign_file \ - dump_fmap \ dev_debug_vboot \ vbutil_what_keys @@ -52,7 +56,13 @@ ALL_DEPS = $(addsuffix .d,${TARGET_BINS}) all: $(TARGET_BINS) $(DUMPKERNELCONFIGLIB) ${BUILD_ROOT}/crossystem: crossystem_main.c $(LIBS) - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) + $(CC) $(CFLAGS) $(AU_LDFLAGS) $< -o $@ $(LIBS) + +${BUILD_ROOT}/gbb_utility: gbb_utility.cc + $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $(AU_LDFLAGS) $< -o $@ + +${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS) + $(CC) $(CFLAGS) $(AU_LDFLAGS) $< -o $@ $(LIBS) ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(CRYPTO_LIBS) @@ -69,9 +79,6 @@ $(DUMPKERNELCONFIGLIB): ${BUILD_ROOT}/dump_kernel_config.o rm -f $@ ar qc $@ $^ -${BUILD_ROOT}/gbb_utility: gbb_utility.cc - $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $(LDFLAGS) $< -o $@ - ${BUILD_ROOT}/bmpblk_utility.o: bmpblk_utility.cc $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) -c $< -o $@ @@ -185,9 +192,6 @@ ${BUILD_ROOT}/mount-encrypted: mount-encrypted.c mount-encrypted.h \ ${BUILD_ROOT}/dev_sign_file: dev_sign_file.c $(LIBS) $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) -${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS) - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) - install: $(TARGET_BINS) mkdir -p $(DESTDIR) cp -f $(TARGET_BINS) $(DESTDIR) |