From f937aa72f51c707b6a629c6709b68552e4a2b5b1 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Sat, 30 Jun 2018 15:48:58 -0700
Subject: [PATCH] builder: disable ccache for openssl

ccache can apparently cause issues when building openssl, as I've
noticed on Mac OS 10.13, save the original values of $CC and $CXX and
pass them to make when building openssl.
---
 tools/builder/core.sh | 5 ++++-
 tools/osx/builder     | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/builder/core.sh b/tools/builder/core.sh
index 433465f9..de103342 100644
--- a/tools/builder/core.sh
+++ b/tools/builder/core.sh
@@ -32,6 +32,8 @@ case "\$CC" in
                     REQUIRED_CMAKE_ARGS="\$REQUIRED_CMAKE_ARGS -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=\$CC -DCMAKE_CXX_COMPILER=\$CXX"
                     ;;
             esac
+            export CC_ORIG=\$CC
+            export CXX_ORIG=\$CXX
             export CC="ccache \$CC"
             export CXX="ccache \$CXX"
         fi
@@ -384,8 +386,9 @@ DIST_ARGS="$DIST_ARGS
 
 DIST_BARE_MAKE_ARGS='CC="$CC"'
 
+# have to disable ccache for openssl
 DIST_MAKE_ARGS="$DIST_MAKE_ARGS
-    openssl     CC=\"\$CC -fPIC\"
+    openssl     CC=\"\$CC_ORIG -fPIC\" CXX=\"\$CXX_ORIG -fPIC\"
     getopt      LDFLAGS=\"\$LDFLAGS -lintl -liconv\" CFLAGS=\"\$CFLAGS\"
     bzip2       libbz2.a bzip2 bzip2recover CFLAGS=\"\$CFLAGS\" LDFLAGS=\"\$LDFLAGS\"
     unzip       generic2
diff --git a/tools/osx/builder b/tools/osx/builder
index 99f2a6d9..2e530ae1 100755
--- a/tools/osx/builder
+++ b/tools/osx/builder
@@ -42,6 +42,7 @@ table_line_remove DISTS shared-mime-info
 
 table_line_replace DIST_CONFIGURE_OVERRIDES openssl './Configure darwin-i386-cc no-shared --prefix=/usr --openssldir=/etc/ssl'
 
+# -Wl,-no_compact_unwind must be passed in LDFLAGS to openssl
 table_line_append DIST_MAKE_ARGS openssl "LDFLAGS=\"\$LDFLAGS\""
 
 # m4 crashes on 10.13