File tree Expand file tree Collapse file tree 8 files changed +20
-20
lines changed Expand file tree Collapse file tree 8 files changed +20
-20
lines changed Original file line number Diff line number Diff line change 66
77NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88
9- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android24 -
9+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android29 -
1010CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111
1212CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313
14- CXX:=$(CROSS_PREFIX24 )clang++
15- CC:=$(CROSS_PREFIX24 )clang
14+ CXX:=$(CROSS_PREFIX29 )clang++
15+ CC:=$(CROSS_PREFIX29 )clang
1616AR:=$(CROSS_PREFIX)ar
1717AS:=$(CROSS_PREFIX)as
1818LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 66
77NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88
9- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi24 -
9+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi29 -
1010CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111
1212CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313
14- CXX:=$(CROSS_PREFIX24 )clang++
15- CC:=$(CROSS_PREFIX24 )clang
14+ CXX:=$(CROSS_PREFIX29 )clang++
15+ CC:=$(CROSS_PREFIX29 )clang
1616AR:=$(CROSS_PREFIX)ar
1717AS:=$(CROSS_PREFIX)as
1818LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 66
77NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88
9- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/i686-linux-android24 -
9+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/i686-linux-android29 -
1010CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111
1212CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313
14- CXX:=$(CROSS_PREFIX24 )clang++
15- CC:=$(CROSS_PREFIX24 )clang
14+ CXX:=$(CROSS_PREFIX29 )clang++
15+ CC:=$(CROSS_PREFIX29 )clang
1616AR:=$(CROSS_PREFIX)ar
1717AS:=$(CROSS_PREFIX)as
1818LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 66
77NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
88
9- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android24 -
9+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android29 -
1010CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
1111
1212CROSS_FLAGS:=-I$(ROOT)/gen/cross
1313
14- CXX:=$(CROSS_PREFIX24 )clang++
15- CC:=$(CROSS_PREFIX24 )clang
14+ CXX:=$(CROSS_PREFIX29 )clang++
15+ CC:=$(CROSS_PREFIX29 )clang
1616AR:=$(CROSS_PREFIX)ar
1717AS:=$(CROSS_PREFIX)as
1818LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 2020 CFLAGS=' -Os' \
2121 CXXFLAGS=' --std=c++17' \
2222 LDFLAGS=' -static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
23- CC=aarch64-linux-android24 -clang \
24- CXX=aarch64-linux-android24 -clang++ \
23+ CC=aarch64-linux-android29 -clang \
24+ CXX=aarch64-linux-android29 -clang++ \
2525 AR=llvm-ar \
2626 RANLIB=llvm-ranlib \
2727 --with-data-packaging=archive
Original file line number Diff line number Diff line change 2020 CFLAGS=' -Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
2121 CXXFLAGS=' --std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
2222 LDFLAGS=' -static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8 -Wl,-rpath=\$$ORIGIN' \
23- CC=armv7a-linux-androideabi24 -clang \
24- CXX=armv7a-linux-androideabi24 -clang++ \
23+ CC=armv7a-linux-androideabi29 -clang \
24+ CXX=armv7a-linux-androideabi29 -clang++ \
2525 AR=llvm-ar \
2626 RANLIB=llvm-ranlib \
2727 --with-data-packaging=archive
Original file line number Diff line number Diff line change 2020 CFLAGS=' -Os' \
2121 CXXFLAGS=' --std=c++17' \
2222 LDFLAGS=' -static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
23- CC=i686-linux-android24 -clang \
24- CXX=i686-linux-android24 -clang++ \
23+ CC=i686-linux-android29 -clang \
24+ CXX=i686-linux-android29 -clang++ \
2525 AR=llvm-ar \
2626 RANLIB=llvm-ranlib \
2727 --with-data-packaging=archive
Original file line number Diff line number Diff line change 2020 CFLAGS=' -Os' \
2121 CXXFLAGS=' --std=c++17' \
2222 LDFLAGS=' -static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
23- CC=x86_64-linux-android24 -clang \
24- CXX=x86_64-linux-android24 -clang++ \
23+ CC=x86_64-linux-android29 -clang \
24+ CXX=x86_64-linux-android29 -clang++ \
2525 AR=llvm-ar \
2626 RANLIB=llvm-ranlib \
2727 --with-data-packaging=archive
You can’t perform that action at this time.
0 commit comments