From 773751e959519803819b3cbe985629dee79a4b81 Mon Sep 17 00:00:00 2001
From: John Haddon <thehaddonyoof@gmail.com>
Date: Tue, 7 Feb 2023 16:48:50 +0000
Subject: [PATCH] Cortex : Work around problem with parallel builds

See https://github.com/ImageEngine/cortex/issues/1308 and https://github.com/ImageEngine/cortex/pull/1309.
---
 Cortex/config.py | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/Cortex/config.py b/Cortex/config.py
index daa43aedf5..022ca82d9d 100644
--- a/Cortex/config.py
+++ b/Cortex/config.py
@@ -23,7 +23,17 @@
 
 	"commands" : [
 
-		"scons install"
+		# Build first.
+		"scons {args}",
+		# The install separately. This avoids a problem with parallel builds - see
+		# https://github.com/ImageEngine/cortex/issues/1308.
+		"scons install {args}",
+
+	],
+
+	"variables" : {
+
+		"args" :
 			" -j {jobs}"
 			" CXX=`which g++`"
 			" CXXSTD=c++{c++Standard}"
@@ -56,7 +66,9 @@
 			" {extraArgs}"
 			" SAVE_OPTIONS=gaffer.options",
 
-	],
+		"extraArgs" : "",
+
+	},
 
 	"manifest" : [
 
@@ -70,12 +82,6 @@
 
 	],
 
-	"variables" : {
-
-		"extraArgs" : "",
-
-	},
-
 	"platform:macos" : {
 
 		"variables" : {