[xulrunner] Don't overwrite CFLAGS/CXXFLAGS

[Christopher Aillon]

commit 26b4be1d4c64cd709d11db498ae32e19a135e736
Author: Christopher Aillon <caillon at redhat.com>
Date:   Sat Jan 29 14:41:45 2011 -0800

    Don't overwrite CFLAGS/CXXFLAGS
    
    The -debuginfo mozconfig was stomping on our CFLAGS/CXXFLAGS.
    Stop passing them in via the configure flag and just pass them
    via their environment variables.

 xulrunner-mozconfig           |    2 +-
 xulrunner-mozconfig-debuginfo |    4 ++--
 xulrunner.spec                |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/xulrunner-mozconfig b/xulrunner-mozconfig
index 0a3d18e..e27a116 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="$MOZ_OPT_FLAGS"
+ac_add_options --enable-optimize
 ac_add_options --enable-xinerama
 ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-pango
diff --git a/xulrunner-mozconfig-debuginfo b/xulrunner-mozconfig-debuginfo
index 5fb7e30..4dd2427 100644
--- a/xulrunner-mozconfig-debuginfo
+++ b/xulrunner-mozconfig-debuginfo
@@ -1,5 +1,5 @@
 # For mozilla's debuginfo:
-export CFLAGS="-gdwarf-2"
-export CXXFLAGS="-gdwarf-2"
+export CFLAGS="$CFLAGS -gdwarf-2"
+export CXXFLAGS="$CXXFLAGS -gdwarf-2"
 export MOZ_DEBUG_SYMBOLS=1
 ac_add_options --enable-crashreporter
diff --git a/xulrunner.spec b/xulrunner.spec
index cd18f33..bcda226 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -208,8 +208,8 @@ MOZ_APP_DIR=%{_libdir}/%{name}-${INTERNAL_GECKO}
 #
 # Disable C++ exceptions since Mozilla code is not exception-safe
 #
-export MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
-                             %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
+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