浏览代码

Revert "OSX: Switch to Clang as the default compiler."

It breaks cross-compilation to Android.
And host "gcc" aliases to "clang", anyway.
Mike Pall 9 年之前
父节点
当前提交
02b9b55976
共有 2 个文件被更改,包括 2 次插入6 次删除
  1. 2 2
      doc/install.html
  2. 0 4
      src/Makefile

+ 2 - 2
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
 </pre>
 
 <h3 id="consoles">Cross-compiling for consoles</h3>

+ 0 - 4
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
 
 ##############################################################################