Fix up optimize flags

Don't pass the opt flags twice to moz, as that will just cause them
to be duplicated in the compile lines.

Also, only need to execute sed once.
This commit is contained in:
Christopher Aillon 2011-01-25 08:54:52 -08:00
commit fb5ad6bfec
2 changed files with 3 additions and 2 deletions

View file

@ -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

View file

@ -203,7 +203,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.
# and disable C++ exceptions
export MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//' | %{__sed} -e 's/-fexceptions/-fno-exceptions/g')
MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | \
%{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS