Merge remote-tracking branch 'origin/master' into f17

f41
Michael Stahl 13 years ago
commit ab44417541

@ -1026,7 +1026,7 @@ export PATH=$QT4DIR/bin:$PATH
#use the RPM_OPT_FLAGS but remove the OOo overridden ones #use the RPM_OPT_FLAGS but remove the OOo overridden ones
for i in $RPM_OPT_FLAGS; do for i in $RPM_OPT_FLAGS; do
case "$i" in case "$i" in
-O?|-pipe|-Wall|-g|-fexceptions) continue;; -pipe|-Wall|-g|-fexceptions) continue;;
esac esac
ARCH_FLAGS="$ARCH_FLAGS $i" ARCH_FLAGS="$ARCH_FLAGS $i"
done done

Loading…
Cancel
Save