[xulrunner] disable C++ exceptions

Martin Stransky stransky at fedoraproject.org
Wed Aug 18 13:19:56 UTC 2010


commit 33fcc16fa7be4126ab8671fd505242f9513766ae
Author: Martin Stransky <stransky at redhat.com>
Date:   Wed Aug 18 15:20:12 2010 +0200

    disable C++ exceptions

 xulrunner-mozconfig |    1 +
 xulrunner.spec      |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig
index 36bebb0..f7e97ed 100644
--- a/xulrunner-mozconfig
+++ b/xulrunner-mozconfig
@@ -31,6 +31,7 @@ ac_add_options --enable-extensions=default
 ac_add_options --enable-libnotify
 ac_add_options --disable-necko-wifi
 ac_add_options --enable-startup-notification
+ac_add_options --disable-cpp-exceptions
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/xulrunner.spec b/xulrunner.spec
index f5fecc3..efee30d 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -183,7 +183,8 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 
 # Mozilla builds with -Wall with exception of a few warnings which show up
 # everywhere in the code; so, don't override that.
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
+# and disable C++ exceptions
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//' | %{__sed} -e 's/-fexceptions//')
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS
 


More information about the scm-commits mailing list