diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-08 13:27:38 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-08 15:04:24 +0200 |
| commit | 3265a628adc82d2b44df833f59ad700a8dfa4292 (patch) | |
| tree | 08378ffe5f948f6d824477b3039c9a1c07b5f0d3 /solenv/gbuild | |
| parent | d448b59e4b808b2074cd733bb15ed55f851da5ed (diff) | |
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.
Diffstat (limited to 'solenv/gbuild')
| -rw-r--r-- | solenv/gbuild/platform/android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk index ba5110937740..03f85ec49712 100644 --- a/solenv/gbuild/platform/android.mk +++ b/solenv/gbuild/platform/android.mk @@ -31,14 +31,11 @@ #please make generic modifications to unxgcc.mk or linux.mk gb_CPUDEFS += -DARM32 gb_COMPILERDEFAULTOPTFLAGS := -Os +gb_CXXFLAGS += -fno-omit-frame-pointer +gb_CFLAGS += -fno-omit-frame-pointer include $(GBUILDDIR)/platform/unxgcc.mk -# See <ndk>/docs/STANDALONE-TOOLCHAIN.html -gb_LinkTarget_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer -gb_LinkTarget_CXXFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer -gb_LinkTarget_LDFLAGS += -Wl,--fix-cortex-a8 - # No unit testing can be run gb_CppunitTest_CPPTESTPRECOMMAND := : |