summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2018-08-08 03:18:50 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2018-10-12 17:41:16 +0530
commiteed9196b082af399ecdb439ce1ab769b436c3e7d (patch)
tree4e97637997825ae30205554ba2a71a39537f653f /config
parent0ad2f6f3c5e4037777b27b8f5ddc8024959577fa (diff)
cerbero: Set allow_parallel_build = False by default on Windows
Setting it in config/win32.cbc and win64.cbc means that it doesn't get set when you run cerbero without any -c arguments, which is the most common mode. win32/win64.cbc are only used while generating the gstreamer binary releases. If we don't disable parallel build for make, we get errors like: C:\MinGW\msys\1.0\bin\make.exe: *** couldn't commit memory for cygwin heap, Win32 error 0
Diffstat (limited to 'config')
-rw-r--r--config/win32.cbc1
-rw-r--r--config/win64.cbc1
-rw-r--r--config/windows.config6
3 files changed, 6 insertions, 2 deletions
diff --git a/config/win32.cbc b/config/win32.cbc
index 4a348d85..16012585 100644
--- a/config/win32.cbc
+++ b/config/win32.cbc
@@ -1,4 +1,3 @@
prefix='c:/gstreamer/1.0/x86'
from cerbero.config import Architecture
target_arch = Architecture.X86
-allow_parallel_build = False
diff --git a/config/win64.cbc b/config/win64.cbc
index 952345ae..1a609234 100644
--- a/config/win64.cbc
+++ b/config/win64.cbc
@@ -2,4 +2,3 @@ prefix='c:/gstreamer/1.0/x86_64'
from cerbero.config import Architecture
arch = Architecture.X86_64
target_arch = Architecture.X86_64
-allow_parallel_build = False
diff --git a/config/windows.config b/config/windows.config
index 276a1697..a7538637 100644
--- a/config/windows.config
+++ b/config/windows.config
@@ -80,6 +80,12 @@ os.environ['ac_cv_lib_bz2_BZ2_bzlibVersion'] = 'yes'
os.environ['ac_cv_c_attribute_aligned'] = '64'
if platform == Platform.WINDOWS:
+ # Make's job server is buggy and broken on Windows, which causes it to
+ # either hang or print server errors like:
+ # 2068442963 [sig] make 18324 sig_dispatch_pending: Win32 error 298 releasing sigcatch_nosync(0x150)
+ # Only use one process to make the build more reliable.
+ allow_parallel_build = False
+
os.environ['ACLOCAL'] = 'aclocal-1.11'
# We use Visual Studio by default on Windows
if 'novisualstudio' not in variants: