Merge pull request #31347 from benley/vboot_reference

vboot_reference: build all the tools
This commit is contained in:
Jörg Thalheim 2017-11-07 09:31:44 +00:00 committed by GitHub
commit 05de801c1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 8 deletions

View file

@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
buildPhase = ''
patches = [ ./dont_static_link.patch ];
preBuild = ''
patchShebangs scripts
make -j''${NIX_BUILD_CORES:-1} \
`pwd`/build/cgpt/cgpt \
`pwd`/build/futility/futility
'';
installPhase = ''
mkdir -p $out/bin
cp build/cgpt/cgpt $out/bin
cp build/futility/futility $out/bin
makeFlags = [
"DESTDIR=$(out)"
];
postInstall = ''
mkdir -p $out/share/vboot
cp -r tests/devkeys* $out/share/vboot/
'';

View file

@ -0,0 +1,30 @@
---
--- a/Makefile
+++ b/Makefile
@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2
# Link tests for external repos
${BUILD}/host/linktest/extern: ${HOSTLIB}
${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
-${BUILD}/host/linktest/extern: LDLIBS += -static
+#${BUILD}/host/linktest/extern: LDLIBS += -static
TEST_OBJS += ${BUILD}/host/linktest/extern.o
.PHONY: hostlib
@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL
${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
# Utilities for auto-update toolkits must be statically linked.
-${UTIL_BINS_STATIC}: LDFLAGS += -static
+${UTIL_BINS_STATIC}:
.PHONY: utils
@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
@${PRINTF} " LD $(subst ${BUILD}/,,$@)\n"
- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS}
${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB}