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/inc/unxandr.mk | |
| 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/inc/unxandr.mk')
| -rw-r--r-- | solenv/inc/unxandr.mk | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk index fdf9b6d77e9d..56ed49d155a4 100644 --- a/solenv/inc/unxandr.mk +++ b/solenv/inc/unxandr.mk @@ -29,18 +29,10 @@ CDEFAULTOPT=-Os .INCLUDE : unxgcc.mk - -# Amend some macros set by unxgcc.mk - CDEFS+=-DARM32 -CFLAGS+=-march=armv7-a -mfloat-abi=softfp -mthumb -mfpu=neon -fno-omit-frame-pointer - -LINKFLAGS+=-Wl,--fix-cortex-a8 +CFLAGS+=-fno-omit-frame-pointer -STDLIBGUIMT+=-llog -landroid -STDLIBCUIMT+=-llog -landroid - -# Completely override some others +# Override some macros set by unxgcc.mk # We don't build any "tool" style programs for non-desktop OSes like # Android. Just unit tests and GUI programs. (Well, that is in @@ -53,3 +45,6 @@ STDLIBCUIMT+=-llog -landroid LINKFLAGSAPPGUI=-shared LINKFLAGSAPPCUI=-shared +STDLIBGUIMT+=-llog -landroid +STDLIBCUIMT+=-llog -landroid + |