ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Rafael Kitover 2018-06-30 15:48:58 -07:00
parent 7aa5d9398e
commit f937aa72f5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/builder/core.sh
View File

@ -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" 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 esac
export CC_ORIG=\$CC
export CXX_ORIG=\$CXX
export CC="ccache \$CC" export CC="ccache \$CC"
export CXX="ccache \$CXX" export CXX="ccache \$CXX"
fi fi
@ -384,8 +386,9 @@ DIST_ARGS="$DIST_ARGS
DIST_BARE_MAKE_ARGS='CC="$CC"' DIST_BARE_MAKE_ARGS='CC="$CC"'
# have to disable ccache for openssl
DIST_MAKE_ARGS="$DIST_MAKE_ARGS 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\" getopt LDFLAGS=\"\$LDFLAGS -lintl -liconv\" CFLAGS=\"\$CFLAGS\"
bzip2 libbz2.a bzip2 bzip2recover CFLAGS=\"\$CFLAGS\" LDFLAGS=\"\$LDFLAGS\" bzip2 libbz2.a bzip2 bzip2recover CFLAGS=\"\$CFLAGS\" LDFLAGS=\"\$LDFLAGS\"
unzip generic2 unzip generic2

1
tools/osx/builder
View File

@ -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' 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\"" table_line_append DIST_MAKE_ARGS openssl "LDFLAGS=\"\$LDFLAGS\""
# m4 crashes on 10.13 # m4 crashes on 10.13