diff options
| author | Jing Yu <jingyu@google.com> | 2010-07-22 14:27:24 -0700 |
|---|---|---|
| committer | Jing Yu <jingyu@google.com> | 2010-07-22 14:27:24 -0700 |
| commit | f82379147a1d2c484dcc1bb47c4ecd90e40fa3e2 (patch) | |
| tree | f155165f84ed5ef99e0c534847f09c2a7ebc2d2c /Makefile.in | |
| parent | 9241075ae56eaf941a961eae0d1c14f647785306 (diff) | |
Prepare build for upcoming arm-linux-androideabi toolchain.
Change-Id: I9b1cd5f0d361d092c24557ae1a2e2e2b85b13aaf
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index f66edc7..12d355d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,12 +98,12 @@ export CC_FOR_TARGET="$(TARGET_GCC_BUILDDIR)/gcc/xgcc \ # # To build libstdc++ with RTTI and exceptions do: # -# CFLAGS_FOR_TARGET= -O2 -Os -g -fexceptions -# CXXFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET) -frtti +#CFLAGS_FOR_TARGET= -O2 -Os -g -fexceptions +#CXXFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET) -frtti # CFLAGS_FOR_TARGET= -O2 -Os -g CXXFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET) -LDFLAGS_FOR_TARGET=-mandroid +LDFLAGS_FOR_TARGET= # Helper prefix-list = $(foreach e, $(2), $(join $1, $e)) @@ -188,7 +188,10 @@ CFLAGS_FOR_TARGET += -DTARGET_POSIX_IO -fno-short-enums # ARM specific options. ifeq ($(target_cpu),arm) GCC_CONFIG_ARGS += --with-float=soft --with-fpu=vfp --with-arch=armv5te \ - --enable-target-optspace --with-abi=aapcs + --enable-target-optspace +ifneq ($(target_os),linux-androideabi) +GCC_CONFIG_ARGS += --with-abi=aapcs +endif endif endif |