From 1026860ac0ad081210dfe3cf36550f01fb489285 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Tue, 7 Aug 2012 18:12:42 +0000 Subject: [PATCH] build: only pass -fno-exceptions -fno-rtti to the C++ compiler, never to the C compiler (the Android build script did that). --- build/lol-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lol-build b/build/lol-build index 981c94eb..c5a867d5 100755 --- a/build/lol-build +++ b/build/lol-build @@ -153,9 +153,9 @@ configure() # No configuration needed ;; android-arm) - CPPFLAGS="-Wno-psabi -I$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/stlport -fpic -fno-exceptions -fno-rtti -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64" + CPPFLAGS="-Wno-psabi -I$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/stlport -fpic -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64" CFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb" - CXXFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb" + CXXFLAGS="-march=armv5te -mtune=xscale -msoft-float -mthumb -fno-rtti -fno-exceptions" LOL_LIBS="-L$ANDROID_NDK_ROOT/sources/cxx-stl/stlport/libs/armeabi -lstlport_shared -lm -fpic -XCClinker -shared" ./configure --host=arm-linux-androideabi ac_cv_exeext=.so CPPFLAGS="$CPPFLAGS" CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LOL_LIBS="$LOL_LIBS" # FIXME: is this needed?