Fixes for linux builds
diff --git a/Makefile b/Makefile
index 75ba742..ca84960 100644
--- a/Makefile
+++ b/Makefile
@@ -274,12 +274,6 @@
ifdef OPENSSL_INC
CFLAGS += -I ${OPENSSL_INC}
endif
-ifdef OPENSSL_LIB
- LDFLAGS += -L ${OPENSSL_LIB}
-endif
-ifdef CRYPTO_LIB
- LDFLAGS += -L ${CRYPTO_LIB}
-endif
export BUILD_RUN
@@ -1268,8 +1262,13 @@
${Q}mv -f $@.tmp $@
# Some utilities need external crypto functions
+ifdef CRYPTO_LIB
+CRYPTO_LIBS := ${CRYPTO_LIB}
+CRYPTO_STATIC_LIBS := ${CRYPTO_LIB}
+else
CRYPTO_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto)
CRYPTO_STATIC_LIBS := $(shell ${PKG_CONFIG} --libs libcrypto --static)
+endif
${BUILD}/utility/dumpRSAPublicKey: LDLIBS += ${CRYPTO_LIBS}
${BUILD}/utility/pad_digest_utility: LDLIBS += ${CRYPTO_LIBS}
diff --git a/scripts/build-futility.sh b/scripts/build-futility.sh
index e1c6796..81a7983 100755
--- a/scripts/build-futility.sh
+++ b/scripts/build-futility.sh
@@ -26,12 +26,15 @@
${NINJA_PROGRAM}
popd
+LDFLAGS=
HAVE_MACOS=0
if [[ $(uname) == "Darwin" ]]; then
- HAVE_MACOS=1
+ HAVE_MACOS=1
+else
+ LDFLAGS="-lpthread"
fi
(
cd "${VBOOT_DIR}"
- make HAVE_MACOS=${HAVE_MACOS} CRYPTO_LIB="${BORINGSSL_BUILD}/crypto" OPENSSL_INC="${BORINGSSL_SRC}/include" OPENSSL_LIB="${BORINGSSL_BUILD}/ssl" ARCH=x86_64 `pwd`/build/futility/futility
-)
\ No newline at end of file
+ make LDFLAGS="${LDFLAGS}" HAVE_MACOS="${HAVE_MACOS}" CRYPTO_LIB="${BORINGSSL_BUILD}/crypto/libcrypto.a" OPENSSL_INC="${BORINGSSL_SRC}/include" ARCH=x86_64 `pwd`/build/futility/futility
+)
