Merge branch 'master' into f20

Conflicts: ustl.spec
Revert back.
2014-08-08 16:57:55 +08:00 · 2014-08-05 16:33:41 +08:00
1 changed files with 1 additions and 1 deletions
--- a/ustl.spec
+++ b/ustl.spec
@ -59,7 +59,7 @@ sed -i -e 's|-march=native||g' configure
 %endif
  --with-libstdc++ --force-inline

-%make_build CXXFLAGS+="%{optflags}"
+make %{?_smp_mflags} CXXFLAGS+="%{optflags}"

 %install
 %make_install LIBDIR="%{buildroot}%{_libdir}"
Author	SHA1	Message	Date
Christopher Meng	e6476df6bc	Merge branch 'master' into f20 Conflicts: ustl.spec	2014-08-08 16:57:55 +08:00
Christopher Meng	c19880725d	Revert back.	2014-08-05 16:33:41 +08:00