[xulrunner] Revert part of fb5ad6b

[Christopher Aillon]

commit 5b49dc5f7b621a3030db869637c8278a3afe87ee
Author: Christopher Aillon <caillon at redhat.com>
Date:   Tue Jan 25 13:42:54 2011 -0800

    Revert part of fb5ad6b
    
    CXXFLAGS is apparently not picked up by xpcom/glue which is one of
    the places we need -fpermissive in order to build with GCC 4.6.

 xulrunner-mozconfig |    2 +-
 xulrunner.spec      |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig
index e27a116..0a3d18e 100644
--- a/xulrunner-mozconfig
+++ b/xulrunner-mozconfig
@@ -18,7 +18,7 @@ ac_add_options --disable-tests
 ac_add_options --disable-mochitest
 ac_add_options --disable-installer
 ac_add_options --disable-debug
-ac_add_options --enable-optimize
+ac_add_options --enable-optimize="$MOZ_OPT_FLAGS"
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-pango
diff --git a/xulrunner.spec b/xulrunner.spec
index db76971..e1bf46c 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -207,8 +207,8 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 #
 # Disable C++ exceptions since Mozilla code is not exception-safe
 #
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
-                      %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+export MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
+                             %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
 export CFLAGS=$MOZ_OPT_FLAGS
 export CXXFLAGS=$MOZ_OPT_FLAGS