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 6
6
7
7
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
8
8
9
- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android24 -
9
+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android29 -
10
10
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
11
11
12
12
CROSS_FLAGS:=-I$(ROOT)/gen/cross
13
13
14
- CXX:=$(CROSS_PREFIX24 )clang++
15
- CC:=$(CROSS_PREFIX24 )clang
14
+ CXX:=$(CROSS_PREFIX29 )clang++
15
+ CC:=$(CROSS_PREFIX29 )clang
16
16
AR:=$(CROSS_PREFIX)ar
17
17
AS:=$(CROSS_PREFIX)as
18
18
LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 6
6
7
7
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
8
8
9
- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi24 -
9
+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi29 -
10
10
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
11
11
12
12
CROSS_FLAGS:=-I$(ROOT)/gen/cross
13
13
14
- CXX:=$(CROSS_PREFIX24 )clang++
15
- CC:=$(CROSS_PREFIX24 )clang
14
+ CXX:=$(CROSS_PREFIX29 )clang++
15
+ CC:=$(CROSS_PREFIX29 )clang
16
16
AR:=$(CROSS_PREFIX)ar
17
17
AS:=$(CROSS_PREFIX)as
18
18
LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 6
6
7
7
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
8
8
9
- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/i686-linux-android24 -
9
+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/i686-linux-android29 -
10
10
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
11
11
12
12
CROSS_FLAGS:=-I$(ROOT)/gen/cross
13
13
14
- CXX:=$(CROSS_PREFIX24 )clang++
15
- CC:=$(CROSS_PREFIX24 )clang
14
+ CXX:=$(CROSS_PREFIX29 )clang++
15
+ CC:=$(CROSS_PREFIX29 )clang
16
16
AR:=$(CROSS_PREFIX)ar
17
17
AS:=$(CROSS_PREFIX)as
18
18
LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 6
6
7
7
NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64
8
8
9
- CROSS_PREFIX24 :=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android24 -
9
+ CROSS_PREFIX29 :=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android29 -
10
10
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-
11
11
12
12
CROSS_FLAGS:=-I$(ROOT)/gen/cross
13
13
14
- CXX:=$(CROSS_PREFIX24 )clang++
15
- CC:=$(CROSS_PREFIX24 )clang
14
+ CXX:=$(CROSS_PREFIX29 )clang++
15
+ CC:=$(CROSS_PREFIX29 )clang
16
16
AR:=$(CROSS_PREFIX)ar
17
17
AS:=$(CROSS_PREFIX)as
18
18
LD:=$(CROSS_PREFIX)ld
Original file line number Diff line number Diff line change 20
20
CFLAGS=' -Os' \
21
21
CXXFLAGS=' --std=c++17' \
22
22
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++ \
25
25
AR=llvm-ar \
26
26
RANLIB=llvm-ranlib \
27
27
--with-data-packaging=archive
Original file line number Diff line number Diff line change 20
20
CFLAGS=' -Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
21
21
CXXFLAGS=' --std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
22
22
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++ \
25
25
AR=llvm-ar \
26
26
RANLIB=llvm-ranlib \
27
27
--with-data-packaging=archive
Original file line number Diff line number Diff line change 20
20
CFLAGS=' -Os' \
21
21
CXXFLAGS=' --std=c++17' \
22
22
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++ \
25
25
AR=llvm-ar \
26
26
RANLIB=llvm-ranlib \
27
27
--with-data-packaging=archive
Original file line number Diff line number Diff line change 20
20
CFLAGS=' -Os' \
21
21
CXXFLAGS=' --std=c++17' \
22
22
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++ \
25
25
AR=llvm-ar \
26
26
RANLIB=llvm-ranlib \
27
27
--with-data-packaging=archive
You can’t perform that action at this time.
0 commit comments