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.
This commit is contained in:
parent
7aa5d9398e
commit
f937aa72f5
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue