old contribs: Use sane compilation flags for android

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index bd6fe07671e95353a3a4fc16f4b242ad5b7521f9..4db4795e2f6e2323f5409de2af81e499ed6f3016 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -360,8 +360,8 @@ case "$DISTRO" in
     fi
     # The given host (arm-eabi) is not the real one (arm-linux-androideabi)
     ln -sfn $TARGET hosts/arm-linux-androideabi
-    CC="arm-linux-androideabi-gcc -nostdlib -lc -lgcc"
-    CXX="arm-linux-androideabi-g++ -nostdlib -lc -lgcc"
+    CC="arm-linux-androideabi-gcc --sysroot=$ANDROID_NDK/platforms/android-9/arch-arm"
+    CXX="arm-linux-androideabi-g++ --sysroot=$ANDROID_NDK/platforms/android-9/arch-arm"
     NM=arm-linux-androideabi-nm
     AR=arm-linux-androideabi-ar
     LD=arm-linux-androideabi-ld

diff --git a/extras/contrib/src/Distributions/android.mak b/extras/contrib/src/Distributions/android.mak
index c68f186f8b0df3c1e21d18dd16932ea9fe7905d8..e1b14c7c1c96082360eaf569d8a8bd15e897ecf9 100644 (file)
--- a/extras/contrib/src/Distributions/android.mak
+++ b/extras/contrib/src/Distributions/android.mak
@@ -12,4 +12,4 @@ ANDROID_INCLUDE=$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/include
 ANDROID_LIB=$(ANDROID_NDK)/platforms/android-9/arch-arm/usr/lib
 
 EXTRA_CPPFLAGS+=-I$(ANDROID_INCLUDE)
-EXTRA_LDFLAGS+=-Wl,-rpath-link=$(ANDROID_LIB),-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -Wl,-shared -L$(ANDROID_LIB)
+EXTRA_LDFLAGS+=-Wl,-rpath-link=$(ANDROID_LIB),-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined -L$(ANDROID_LIB)