generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Travis - don't use ccache with cross compiles

Browse Source 
Although theoretically possible, Configure doesn't treat CC variable
set like this very well: CC="ccache i686-w64-mingw32-gcc"
Also, this Travis script doesn't recognise the possibility either.

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte
2016-03-10 02:14:55 +01:00
parent a1673e1536
commit a70ca74086
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -67,9 +67,6 @@ before_script:
srcdir=../_srcdist; srcdir=../_srcdist;
mkdir _build; mkdir _build;
cd _build; cd _build;
if which ccache >/dev/null; then
CC="ccache $CC";
fi
fi fi
- if [ "$CC" == i686-w64-mingw32-gcc ]; then - if [ "$CC" == i686-w64-mingw32-gcc ]; then
export CROSS_COMPILE=${CC%%gcc}; unset CC; export CROSS_COMPILE=${CC%%gcc}; unset CC;
@@ -78,6 +75,9 @@ before_script:
export CROSS_COMPILE=${CC%%gcc}; unset CC; export CROSS_COMPILE=${CC%%gcc}; unset CC;
$srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format;
else else
if which ccache >/dev/null; then
CC="ccache $CC";
fi
$srcdir/config $CONFIG_OPTS; $srcdir/config $CONFIG_OPTS;
fi fi
- cd .. - cd ..