diff options
Diffstat (limited to 'utility/Makefile')
| -rw-r--r-- | utility/Makefile | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/utility/Makefile b/utility/Makefile index b99126b2..81918813 100644 --- a/utility/Makefile +++ b/utility/Makefile @@ -52,14 +52,15 @@ ALL_DEPS = $(addsuffix .d,${TARGET_BINS}) all: $(TARGET_BINS) $(DUMPKERNELCONFIGLIB) ${BUILD_ROOT}/crossystem: crossystem_main.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) ${BUILD_ROOT}/dumpRSAPublicKey: dumpRSAPublicKey.c - $(CC) $(CFLAGS) $< -o $@ $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(CRYPTO_LIBS) ${BUILD_ROOT}/dump_kernel_config: dump_kernel_config_main.c \ $(DUMPKERNELCONFIGLIB) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(DUMPKERNELCONFIGLIB) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ \ + $(LIBS) $(DUMPKERNELCONFIGLIB) $(CRYPTO_LIBS) ${BUILD_ROOT}/dump_kernel_config.o: dump_kernel_config.c $(CC) $(CFLAGS) -c $< -o $@ @@ -69,7 +70,7 @@ $(DUMPKERNELCONFIGLIB): ${BUILD_ROOT}/dump_kernel_config.o ar qc $@ $^ ${BUILD_ROOT}/gbb_utility: gbb_utility.cc - $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $< -o $@ + $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) $(LDFLAGS) $< -o $@ ${BUILD_ROOT}/bmpblk_utility.o: bmpblk_utility.cc $(CXX) -DWITH_UTIL_MAIN $(CFLAGS) -c $< -o $@ @@ -87,13 +88,13 @@ ${BUILD_ROOT}/eficompress.o: eficompress.c $(CC) $(CFLAGS) -c $< -o $@ ${BUILD_ROOT}/eficompress: eficompress.c - $(CC) $(CFLAGS) -DSTANDALONE $< -o $@ + $(CC) $(CFLAGS) -DSTANDALONE $(LDFLAGS) $< -o $@ ${BUILD_ROOT}/efidecompress.o: efidecompress.c $(CC) $(CFLAGS) -c $< -o $@ ${BUILD_ROOT}/efidecompress: efidecompress.c - $(CC) $(CFLAGS) -DSTANDALONE $< -o $@ + $(CC) $(CFLAGS) -DSTANDALONE $(LDFLAGS) $< -o $@ ${BUILD_ROOT}/bmpblk_utility: ${BUILD_ROOT}/bmpblk_utility.o \ ${BUILD_ROOT}/bmpblk_util.o \ @@ -104,50 +105,50 @@ ${BUILD_ROOT}/bmpblk_utility: ${BUILD_ROOT}/bmpblk_utility.o \ ${BUILD_ROOT}/bmpblk_font: ${BUILD_ROOT}/bmpblk_font.o \ ${BUILD_ROOT}/image_types.o - $(CC) $(CFLAGS) $^ -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ # TODO: rewrite load_firmware_test to support new wrapper API #${BUILD_ROOT}/load_firmware_test: load_firmware_test.c $(LIBS) -# $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) +# $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/load_kernel_test: load_kernel_test.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/pad_digest_utility: pad_digest_utility.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/signature_digest_utility: signature_digest_utility.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/tlcl_generator: tlcl_generator.c - $(HOSTCC) $(CFLAGS) -fpack-struct $< -o $@ + $(HOSTCC) $(CFLAGS) -fpack-struct $(LDFLAGS) $< -o $@ ${BUILD_ROOT}/vbutil_ec: vbutil_ec.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/vbutil_firmware: vbutil_firmware.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/vbutil_kernel: vbutil_kernel.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/vbutil_key: vbutil_key.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/vbutil_keyblock: vbutil_keyblock.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/verify_data: verify_data.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/sign_image: sign_image.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/tpm_init_temp_fix: tpm_init_temp_fix.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) ${BUILD_ROOT}/tpm_set_readsrkpub: tpm_set_readsrkpub.c - $(CC) $(CFLAGS) $< -o $@ -ltspi + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ -ltspi ${BUILD_ROOT}/dev_make_keypair: dev_make_keypair cp -f $< $@ @@ -162,7 +163,7 @@ ${BUILD_ROOT}/vbutil_what_keys: vbutil_what_keys chmod +x $@ ${BUILD_ROOT}/tpmc: tpmc.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) ${BUILD_ROOT}/mount-helpers.o: mount-helpers.c mount-helpers.h mount-encrypted.h $(CC) -Wall -Werror -O2 -D_FORTIFY_SOURCE=2 -fstack-protector \ @@ -177,14 +178,15 @@ ${BUILD_ROOT}/mount-encrypted: mount-encrypted.c mount-encrypted.h \ $(shell $(PKG_CONFIG) --cflags glib-2.0 openssl) \ -I$(FWDIR)/include \ -I$(HOSTDIR)/include \ + $(LDFLAGS) \ $< -o $@ $(shell $(PKG_CONFIG) --libs glib-2.0 openssl) \ ${BUILD_ROOT}/mount-helpers.o $(LIBS) ${BUILD_ROOT}/dev_sign_file: dev_sign_file.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) $(CRYPTO_LIBS) ${BUILD_ROOT}/dump_fmap: dump_fmap.c $(LIBS) - $(CC) $(CFLAGS) $< -o $@ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ $(LIBS) install: $(TARGET_BINS) mkdir -p $(DESTDIR) |