diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-08-08 03:18:50 +0530 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2018-11-09 08:27:18 +0000 |
| commit | b7933b0f65bc208a27001526f401a5fc6f3a77bd (patch) | |
| tree | cb57eea45995a95e14a00fed335b3db6a394dbc7 | |
| parent | 8ada66ee3594bbe6c5f359e6d9e67591e5f6cf43 (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
| -rw-r--r-- | config/win32.cbc | 1 | ||||
| -rw-r--r-- | config/win64.cbc | 1 | ||||
| -rw-r--r-- | config/windows.config | 6 |
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 f36fc52e..1a819fe4 100644 --- a/config/windows.config +++ b/config/windows.config @@ -83,4 +83,10 @@ os.environ['DIRECTX_CFLAGS'] = '-I%s/%s/include/directx' % (toolchain_prefix, ho os.environ['DIRECTX_LDFLAGS'] = '-L%s/lib' % toolchain_prefix 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' |