From 1b9033d6ca90e766fc344a78ee3739c81b3e5244 Mon Sep 17 00:00:00 2001 From: Benjamin Barenblat Date: Tue, 3 Jul 2018 14:23:44 -0400 Subject: Update BoringSSL https://boringssl.googlesource.com/boringssl/+/03de6813d8992a649092b4874ef0ebc022e2f58a means BoringSSL now by default includes relocations that don't play well with shared libraries. Make `cabal build --enable-shared` work again by building all BoringSSL code as PIC. --- Setup.hs | 1 + third_party/boringssl/src | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Setup.hs b/Setup.hs index 49b78d3..529524a 100644 --- a/Setup.hs +++ b/Setup.hs @@ -49,6 +49,7 @@ boringsslBuild flags = do [ "cmake" , "-GNinja" , "-DCMAKE_BUILD_TYPE=Release" + , "-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE" , "-B" ++ buildDir , "-H" ++ boringsslDir "src" ] diff --git a/third_party/boringssl/src b/third_party/boringssl/src index 5fca613..997ff09 160000 --- a/third_party/boringssl/src +++ b/third_party/boringssl/src @@ -1 +1 @@ -Subproject commit 5fca61391822252baf3dc37529ba02f6d7611acf +Subproject commit 997ff094af5b47634b8dd136c78884eae25eaa1f -- cgit v1.2.3