]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
Merge branch 'master' into v2.1
authorMike Pall <mike>
Mon, 7 Mar 2022 08:51:40 +0000 (09:51 +0100)
committerMike Pall <mike>
Mon, 7 Mar 2022 08:51:56 +0000 (09:51 +0100)
1  2 
doc/install.html

index 3231e268b565cb63be234a01b6a3d7796c5a17a2,02e0405abbbf23e32cc3ee0479d271a2e4a64f13..90f76bf8d2adfb81b4b9e8f62e05070612a16443
@@@ -404,17 -372,8 +404,17 @@@ Please adapt the environment variables 
  desired target platform. E.g. Android&nbsp;4.1 corresponds to ABI level&nbsp;16.
  </p>
  <pre class="code">
 -# Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.1+ (JB)
 +# Android/ARM64, aarch64, Android 5.0+ (L)
 +NDKDIR=/opt/android/ndk
 +NDKBIN=$NDKDIR/toolchains/llvm/prebuilt/linux-x86_64/bin
 +NDKCROSS=$NDKBIN/aarch64-linux-android-
 +NDKCC=$NDKBIN/aarch64-linux-android21-clang
 +make CROSS=$NDKCROSS \
 +     STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \
-      TARGET_LD=$NDKCC TARGET_AR=$NDKBIN/llvm-ar
++     TARGET_LD=$NDKCC TARGET_AR="$NDKBIN/llvm-ar rcus" \
 +     TARGET_STRIP=$NDKBIN/llvm-strip
  
 +# Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.1+ (JB)
  NDKDIR=/opt/android/ndk
  NDKBIN=$NDKDIR/toolchains/llvm/prebuilt/linux-x86_64/bin
  NDKCROSS=$NDKBIN/arm-linux-androideabi-