mirror of
https://github.com/LuaJIT/LuaJIT.git
synced 2025-02-07 15:14:08 +00:00
Merge branch 'master' into v2.1
This commit is contained in:
commit
f004a51b3a
@ -411,7 +411,7 @@ NDKCROSS=$NDKBIN/aarch64-linux-android-
|
|||||||
NDKCC=$NDKBIN/aarch64-linux-android21-clang
|
NDKCC=$NDKBIN/aarch64-linux-android21-clang
|
||||||
make CROSS=$NDKCROSS \
|
make CROSS=$NDKCROSS \
|
||||||
STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \
|
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
|
TARGET_STRIP=$NDKBIN/llvm-strip
|
||||||
|
|
||||||
# Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.1+ (JB)
|
# Android/ARM, armeabi-v7a (ARMv7 VFP), Android 4.1+ (JB)
|
||||||
@ -421,7 +421,7 @@ NDKCROSS=$NDKBIN/arm-linux-androideabi-
|
|||||||
NDKCC=$NDKBIN/armv7a-linux-androideabi16-clang
|
NDKCC=$NDKBIN/armv7a-linux-androideabi16-clang
|
||||||
make HOST_CC="gcc -m32" CROSS=$NDKCROSS \
|
make HOST_CC="gcc -m32" CROSS=$NDKCROSS \
|
||||||
STATIC_CC=$NDKCC DYNAMIC_CC="$NDKCC -fPIC" \
|
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
|
TARGET_STRIP=$NDKBIN/llvm-strip
|
||||||
</pre>
|
</pre>
|
||||||
<p>
|
<p>
|
||||||
|
Loading…
Reference in New Issue
Block a user