Prepare build for upcoming arm-linux-androideabi toolchain.
[android/toolchain/build.git] / Makefile.in
index f66edc7..12d355d 100644 (file)
@@ -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