From 02b9b5597679658bbd8716cdeaaa33f04b1f6a3c Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Sun, 31 Jul 2016 13:26:58 +0200 Subject: [PATCH] Revert "OSX: Switch to Clang as the default compiler." It breaks cross-compilation to Android. And host "gcc" aliases to "clang", anyway. --- doc/install.html | 4 ++-- src/Makefile | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/install.html b/doc/install.html index a34f39f0..e3139583 100644 --- a/doc/install.html +++ b/doc/install.html @@ -455,8 +455,8 @@ Or use Android. :-p ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) ICC=$(xcrun --sdk iphoneos --find clang) ISDKF="-arch armv7 -isysroot $ISDKP" -make HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $ICC)/" \ - TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS +make DEFAULT_CC=clang HOST_CC="clang -m32 -arch i386" \ + CROSS="$(dirname $ICC)/" TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS

Cross-compiling for consoles

diff --git a/src/Makefile b/src/Makefile index 1cddf188..9285c11f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -169,10 +169,6 @@ else HOST_SYS= Windows HOST_MSYS= cygwin endif - # Use Clang for OSX host. - ifeq (Darwin,$(HOST_SYS)) - DEFAULT_CC= clang - endif endif ##############################################################################