aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authordavilla <davilla@4pi.com>2011-11-23 23:04:25 -0500
committerdavilla <davilla@4pi.com>2011-11-23 23:04:49 -0500
commite86e4f44dfb61aea1dbdbfc1535fc2f6b3d46f98 (patch)
tree0366cffd4ad724ebc8918379d3400f7db66b3647 /tools
parentf6ba74c9273a2f8f98c0de2c4e77c291734e0552 (diff)
[ios] fixed, -Os can generate broked code and we should not be using it for building depends
Diffstat (limited to 'tools')
-rw-r--r--tools/darwin/depends/config.site_ios.in9
-rw-r--r--tools/darwin/depends/config.site_ios.mk.in2
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/darwin/depends/config.site_ios.in b/tools/darwin/depends/config.site_ios.in
index 9df5ca2ed9..090044f880 100644
--- a/tools/darwin/depends/config.site_ios.in
+++ b/tools/darwin/depends/config.site_ios.in
@@ -5,7 +5,7 @@ cross_compiling=yes
platform_min_version="iphoneos-version-min=4.1"
platform_path="/Developer/Platforms/iPhoneOS.platform/Developer"
-platform_os_cflags="-arch @use_arch@ -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -Os -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2"
+platform_os_cflags="-arch @use_arch@ -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2"
platform_os_ldflags="-arch @use_arch@ -mcpu=cortex-a8"
platform_sdk_path="${platform_path}/SDKs/iPhoneOS${platform_sdk_version}.sdk"
@@ -67,6 +67,13 @@ if test "${ac_unique_file}" = "fonts.dtd" ; then
with_arch=arm
fi
+# tweaks for flac
+if test "${ac_unique_file}" = "src/flac/main.c" ; then
+ # compiler barfs if we use -O3/O2 for flac
+ export CFLAGS=`echo ${CFLAGS} | sed 's/-O3/-Os/'`
+ export CPPFLAGS=`echo ${CPPFLAGS} | sed 's/-O3/-Os/'`
+fi
+
# tweaks for curl
if test "${PACKAGE_NAME}" = "curl" ; then
ac_cv_file___dev_urandom_=yes
diff --git a/tools/darwin/depends/config.site_ios.mk.in b/tools/darwin/depends/config.site_ios.mk.in
index 8705c0434f..7713851049 100644
--- a/tools/darwin/depends/config.site_ios.mk.in
+++ b/tools/darwin/depends/config.site_ios.mk.in
@@ -5,7 +5,7 @@ cross_compiling=yes
platform_min_version=iphoneos-version-min=4.1
platform_path=/Developer/Platforms/iPhoneOS.platform/Developer
-platform_os_cflags=-arch @use_arch@ -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -Os -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2
+platform_os_cflags=-arch @use_arch@ -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -pipe -Wno-trigraphs -fpascal-strings -O3 -Wreturn-type -Wunused-variable -fmessage-length=0 -gdwarf-2
platform_os_ldflags=-arch @use_arch@ -mcpu=cortex-a8
platform_sdk_path=${platform_path}/SDKs/iPhoneOS${platform_sdk_version}.sdk