steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build.sh: Only find the mingw compiler on Windows. 

Fixes #2269
master
Doug Coleman 2020-03-30 20:37:38 -05:00
parent 905e2cfb6b
commit 0f9959a15b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build.sh
View File

@ -154,9 +154,11 @@ clang_version_ok() {
} }
set_cc() { set_cc() {
# on Cygwin we MUST use the MinGW "cross-compiler", therefore check these first # on Cygwin we MUST use the MinGW "cross-compiler", therefore check these first
# furthermore, we prefer 64 bit over 32 bit versions if both are available # furthermore, we prefer 64 bit over 32 bit versions if both are available
# we need this condition so we don't find a mingw32 compiler on linux
if [[ $OS == windows ]] ; then
test_programs_installed x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++ test_programs_installed x86_64-w64-mingw32-gcc x86_64-w64-mingw32-g++
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
[ -z "$CC" ] && CC=x86_64-w64-mingw32-gcc [ -z "$CC" ] && CC=x86_64-w64-mingw32-gcc
@ -170,6 +172,7 @@ set_cc() {
[ -z "$CXX" ] && CXX=i686-w64-mingw32-g++ [ -z "$CXX" ] && CXX=i686-w64-mingw32-g++
return return
fi fi
fi
test_programs_installed clang clang++ test_programs_installed clang clang++
if [[ $? -ne 0 ]] && clang_version_ok ; then if [[ $? -ne 0 ]] && clang_version_ok ; then