diff options
| author | Mike Pall <mike> | 2016-07-31 13:26:58 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-07-31 13:39:55 +0200 |
| commit | 02b9b5597679658bbd8716cdeaaa33f04b1f6a3c (patch) | |
| tree | 59f4e30d85522f56c3dff5614c0663d31c112094 | |
| parent | 6be5ffdf2b20b870392ee265f6ff7792f072592f (diff) | |
| download | luajit-02b9b5597679658bbd8716cdeaaa33f04b1f6a3c.tar.gz luajit-02b9b5597679658bbd8716cdeaaa33f04b1f6a3c.tar.bz2 luajit-02b9b5597679658bbd8716cdeaaa33f04b1f6a3c.zip | |
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.html | 4 | ||||
| -rw-r--r-- | 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 | |||
| 455 | ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) | 455 | ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) |
| 456 | ICC=$(xcrun --sdk iphoneos --find clang) | 456 | ICC=$(xcrun --sdk iphoneos --find clang) |
| 457 | ISDKF="-arch armv7 -isysroot $ISDKP" | 457 | ISDKF="-arch armv7 -isysroot $ISDKP" |
| 458 | make HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $ICC)/" \ | 458 | make DEFAULT_CC=clang HOST_CC="clang -m32 -arch i386" \ |
| 459 | TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS | 459 | CROSS="$(dirname $ICC)/" TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS |
| 460 | </pre> | 460 | </pre> |
| 461 | 461 | ||
| 462 | <h3 id="consoles">Cross-compiling for consoles</h3> | 462 | <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 | |||
| 169 | HOST_SYS= Windows | 169 | HOST_SYS= Windows |
| 170 | HOST_MSYS= cygwin | 170 | HOST_MSYS= cygwin |
| 171 | endif | 171 | endif |
| 172 | # Use Clang for OSX host. | ||
| 173 | ifeq (Darwin,$(HOST_SYS)) | ||
| 174 | DEFAULT_CC= clang | ||
| 175 | endif | ||
| 176 | endif | 172 | endif |
| 177 | 173 | ||
| 178 | ############################################################################## | 174 | ############################################################################## |
