Cortex : Work around problem with parallel builds

See ImageEngine/cortex#1308 and ImageEngine/cortex#1309.
johnhaddon · Feb 7, 2023 · 92abac3 · 92abac3
1 parent 074733e
commit 92abac3
Showing 1 changed file with 14 additions and 8 deletions.
diff --git 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" : {