diff options
| author | Mike Pall <mike> | 2022-03-07 09:51:40 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-03-07 09:51:56 +0100 |
| commit | f004a51b3abf7c7ed191bf87b9e163ea8112280a (patch) | |
| tree | 5f395a8c529753644e6301708c7c73ce63701303 | |
| parent | c93890ed8b3d12d07ea8c5cfea14a33188d8e218 (diff) | |
| parent | 62339a614f3269c92682cfe90ee5927b65734139 (diff) | |
| download | luajit-f004a51b3abf7c7ed191bf87b9e163ea8112280a.tar.gz luajit-f004a51b3abf7c7ed191bf87b9e163ea8112280a.tar.bz2 luajit-f004a51b3abf7c7ed191bf87b9e163ea8112280a.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | doc/install.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/install.html b/doc/install.html index 3231e268..90f76bf8 100644 --- a/doc/install.html +++ b/doc/install.html | |||
| @@ -411,7 +411,7 @@ NDKCROSS=$NDKBIN/aarch64-linux-android- | |||
| 411 | NDKCC=$NDKBIN/aarch64-linux-android21-clang | 411 | NDKCC=$NDKBIN/aarch64-linux-android21-clang |
| 412 | make CROSS=$NDKCROSS \ | 412 | make CROSS=$NDKCROSS \ |
| 413 | STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \ | 413 | STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \ |
| 414 | TARGET_LD=$NDKCC TARGET_AR=$NDKBIN/llvm-ar | 414 | TARGET_LD=$NDKCC TARGET_AR="$NDKBIN/llvm-ar rcus" \ |
| 415 | TARGET_STRIP=$NDKBIN/llvm-strip | 415 | TARGET_STRIP=$NDKBIN/llvm-strip |
| 416 | 416 | ||
| 417 | # Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.1+ (JB) | 417 | # Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.1+ (JB) |
| @@ -421,7 +421,7 @@ NDKCROSS=$NDKBIN/arm-linux-androideabi- | |||
| 421 | NDKCC=$NDKBIN/armv7a-linux-androideabi16-clang | 421 | NDKCC=$NDKBIN/armv7a-linux-androideabi16-clang |
| 422 | make HOST_CC="gcc -m32" CROSS=$NDKCROSS \ | 422 | make HOST_CC="gcc -m32" CROSS=$NDKCROSS \ |
| 423 | STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \ | 423 | STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \ |
| 424 | TARGET_LD=$NDKCC TARGET_AR=$NDKBIN/llvm-ar | 424 | TARGET_LD=$NDKCC TARGET_AR="$NDKBIN/llvm-ar rcus" \ |
| 425 | TARGET_STRIP=$NDKBIN/llvm-strip | 425 | TARGET_STRIP=$NDKBIN/llvm-strip |
| 426 | </pre> | 426 | </pre> |
| 427 | <p> | 427 | <p> |