Merge branch 'master' into f22

This commit is contained in:
Than Ngo 2015-03-19 15:34:47 +01:00
commit 18a859a201

View File

@ -155,7 +155,9 @@ pushd %{_target_platform}
DEFINES+=ENABLE_JIT=0 DEFINES+=ENABLE_YARR_JIT=0
%endif
make %{?_smp_mflags}
# workaround, disable parallel compilation as it fails to compile in brew
#make %{?_smp_mflags}
make -j2
%if 0%{?docs}
make %{?_smp_mflags} docs