From 3265a628adc82d2b44df833f59ad700a8dfa4292 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 8 Nov 2011 13:27:38 +0200 Subject: Revert "Just put the Android ARM compiler options in the mk files" Nah. Sure, doing it like that is sane if you consider only our own code. But it won't help in making sure these options are used when compiling the 3rd-party external libraries. For that having the options already in the CC and CXX environment variables works nicely, I think. People just need to look at the samples in README.cross. Perhaps we could add the options to CC and CXX in configure.in, though? Is that elegant or not, don't know... This reverts commit 3c4f7242a967d6a3cb9e5e3f88bfb2cc348cc3eb. --- README.cross | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README.cross') diff --git a/README.cross b/README.cross index 6327ea884a9f..7e8c184de3ab 100644 --- a/README.cross +++ b/README.cross @@ -318,8 +318,8 @@ Windows will probably drive you insane.) Here is my autogen.lastrun for Android: SYSBASE=/home/tml/android-ndk-r6b/platforms/android-9/arch-arm -CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti +CC=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm +CXX=ccache /home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-g++ -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon --sysroot /home/tml/android-ndk-r6b/platforms/android-9/arch-arm -I /home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include -I/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L/home/tml/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti AR=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-ar NM=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-nm OBJDUMP=/home/tml/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-objdump -- cgit v1.2.3