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 /doc | |
| 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 'doc')
| -rw-r--r-- | doc/install.html | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/install.html b/doc/install.html index bbc71c98..efeda33c 100644 --- a/doc/install.html +++ b/doc/install.html | |||
| @@ -479,14 +479,15 @@ Or use Android. :-p | |||
| 479 | ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) | 479 | ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) |
| 480 | ICC=$(xcrun --sdk iphoneos --find clang) | 480 | ICC=$(xcrun --sdk iphoneos --find clang) |
| 481 | ISDKF="-arch armv7 -isysroot $ISDKP" | 481 | ISDKF="-arch armv7 -isysroot $ISDKP" |
| 482 | make HOST_CC="clang -m32 -arch i386" CROSS="$(dirname $ICC)/" \ | 482 | make DEFAULT_CC=clang HOST_CC="clang -m32 -arch i386" \ |
| 483 | TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS | 483 | CROSS="$(dirname $ICC)/" TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS |
| 484 | 484 | ||
| 485 | # iOS/ARM64 | 485 | # iOS/ARM64 |
| 486 | ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) | 486 | ISDKP=$(xcrun --sdk iphoneos --show-sdk-path) |
| 487 | ICC=$(xcrun --sdk iphoneos --find clang) | 487 | ICC=$(xcrun --sdk iphoneos --find clang) |
| 488 | ISDKF="-arch arm64 -isysroot $ISDKP" | 488 | ISDKF="-arch arm64 -isysroot $ISDKP" |
| 489 | make CROSS="$(dirname $ICC)/" TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS | 489 | make DEFAULT_CC=clang CROSS="$(dirname $ICC)/" \ |
| 490 | TARGET_FLAGS="$ISDKF" TARGET_SYS=iOS | ||
| 490 | </pre> | 491 | </pre> |
| 491 | 492 | ||
| 492 | <h3 id="consoles">Cross-compiling for consoles</h3> | 493 | <h3 id="consoles">Cross-compiling for consoles</h3> |