summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2016-07-31 13:26:58 +0200
committerMike Pall <mike>2016-07-31 13:39:55 +0200
commit02b9b5597679658bbd8716cdeaaa33f04b1f6a3c (patch)
tree59f4e30d85522f56c3dff5614c0663d31c112094
parent6be5ffdf2b20b870392ee265f6ff7792f072592f (diff)
downloadluajit2-02b9b5597679658bbd8716cdeaaa33f04b1f6a3c.tar.gz
Revert "OSX: Switch to Clang as the default compiler."
It breaks cross-compilation to Android. And host "gcc" aliases to "clang", anyway.
-rw-r--r--doc/install.html4
-rw-r--r--src/Makefile4
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
</pre>
<h3 id="consoles">Cross-compiling for consoles</h3>
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
##############################################################################