diff options
| author | Mike Pall <mike> | 2016-07-31 13:42:49 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-07-31 13:42:49 +0200 |
| commit | f6f838f840b725eaf87fa859b1a2bdc7a695d3a7 (patch) | |
| tree | 0bb19dd9eaefd7731353ffd98d546e6f81e38131 /src | |
| parent | 972a1a4cc6791b4595941d32f27ce2242012164c (diff) | |
| parent | 02b9b5597679658bbd8716cdeaaa33f04b1f6a3c (diff) | |
| download | luajit-f6f838f840b725eaf87fa859b1a2bdc7a695d3a7.tar.gz luajit-f6f838f840b725eaf87fa859b1a2bdc7a695d3a7.tar.bz2 luajit-f6f838f840b725eaf87fa859b1a2bdc7a695d3a7.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Makefile b/src/Makefile index fb5fdcb7..4e479ae5 100644 --- a/src/Makefile +++ b/src/Makefile | |||
| @@ -166,10 +166,6 @@ else | |||
| 166 | HOST_SYS= Windows | 166 | HOST_SYS= Windows |
| 167 | HOST_MSYS= cygwin | 167 | HOST_MSYS= cygwin |
| 168 | endif | 168 | endif |
| 169 | # Use Clang for OSX host. | ||
| 170 | ifeq (Darwin,$(HOST_SYS)) | ||
| 171 | DEFAULT_CC= clang | ||
| 172 | endif | ||
| 173 | endif | 169 | endif |
| 174 | 170 | ||
| 175 | ############################################################################## | 171 | ############################################################################## |