yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

scripts/ndk-make.sh: remove CFLAGS setting

Browse source 
Setting __ANDROID_API__ manually causes
  '__ANDROID_API__' macro redefined [-Werror,-Wmacro-redefined]
when compiling the `ring` crate dependency.

TARGET_CC wrapper should set necessary variables itself.

See similar issue in the `ring` bugtracker for explanation:
https://github.com/briansmith/ring/issues/1519
This commit is contained in:
link2xt 2023-03-03 19:18:33 +00:00
parent e56f24b014
commit 86af180095
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/ndk-make.sh
View file

@ -114,7 +114,6 @@ fi
if test -z $1 || test $1 = armeabi-v7a; then if test -z $1 || test $1 = armeabi-v7a; then
echo "-- cross compiling to armv7-linux-androideabi (arm) --" echo "-- cross compiling to armv7-linux-androideabi (arm) --"
export CFLAGS=-D__ANDROID_API__=16
TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \ TARGET_CC="$TOOLCHAIN/bin/armv7a-linux-androideabi16-clang" \
TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \ TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
cargo rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB" cargo rustc $RELEASEFLAG --target armv7-linux-androideabi -p deltachat_ffi -- -L "$TMPLIB"
@ -123,7 +122,6 @@ fi
if test -z $1 || test $1 = arm64-v8a; then if test -z $1 || test $1 = arm64-v8a; then
echo "-- cross compiling to aarch64-linux-android (arm64) --" echo "-- cross compiling to aarch64-linux-android (arm64) --"
export CFLAGS=-D__ANDROID_API__=21
TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \ TARGET_CC="$TOOLCHAIN/bin/aarch64-linux-android21-clang" \
TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \ TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
cargo rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB" cargo rustc $RELEASEFLAG --target aarch64-linux-android -p deltachat_ffi -- -L "$TMPLIB"
@ -132,7 +130,6 @@ fi
if test -z $1 || test $1 = x86; then if test -z $1 || test $1 = x86; then
echo "-- cross compiling to i686-linux-android (x86) --" echo "-- cross compiling to i686-linux-android (x86) --"
export CFLAGS=-D__ANDROID_API__=16
TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \ TARGET_CC="$TOOLCHAIN/bin/i686-linux-android16-clang" \
TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \ TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
cargo rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB" cargo rustc $RELEASEFLAG --target i686-linux-android -p deltachat_ffi -- -L "$TMPLIB"
@ -141,7 +138,6 @@ fi
if test -z $1 || test $1 = x86_64; then if test -z $1 || test $1 = x86_64; then
echo "-- cross compiling to x86_64-linux-android (x86_64) --" echo "-- cross compiling to x86_64-linux-android (x86_64) --"
export CFLAGS=-D__ANDROID_API__=21
TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \ TARGET_CC="$TOOLCHAIN/bin/x86_64-linux-android21-clang" \
TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \ TARGET_AR="$TOOLCHAIN/bin/llvm-ar" \
cargo rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB" cargo rustc $RELEASEFLAG --target x86_64-linux-android -p deltachat_ffi -- -L "$TMPLIB"