Commit: 8f8b6e17223ccf8055754db1931c9f45ce9cc9bc - Fs-scripts (git)

Commit MetaInfo

• Revision: 8f8b6e17223ccf8055754db1931c9f45ce9cc9bc (tree)
• Zeit: 2023-05-15 16:11:47
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

properly set NINJAFLAGS to qmake

Signed-off-by: Fs <[e-mail]>

Ändern Zusammenfassung

• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/qtCompile/conf.lua

Diff

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -398,6 +398,10 @@ conf.Qt.generateConfTable = function(self, host, job, buildTime)
 		commandLineReplacement.MYSQLPREFIX = ret.WORKSPACE .. configureHost.pathSep .. "buildDir" .. configureHost.pathSep .. replaceVersion(conf.MariaDB.configurations[jobConfigureDetail.mysqlConf].name, nil, targetToolchainVersion)
 	end
 
+	if jobConfigureDetail.NINJAFLAGS then
+		ret.envSet.NINJAFLAGS = jobConfigureDetail.NINJAFLAGS
+	end
+
 	local installFolderName = replaceVersion(jobConfigureDetail.name, hostToolchainVersion, targetToolchainVersion)
 	local installRoot = ret.WORKSPACE .. configureHost.pathSep .. "buildDir" .. configureHost.pathSep .. installFolderName
 	commandLineReplacement.INSTALLROOT = installRoot

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -2085,8 +2085,8 @@ conf.q5_15mal = {
 		"make -j$PARALLELNUM"
 		-webengine-proprietary-codecs
 		QMAKE_APPLE_DEVICE_ARCHS="arm64 x86_64"
-		NINJAFLAGS="-v -j$(expr $PARALLELNUM / 2)"
 	]],
+	NINJAFLAGS = "-v -j4"
 }
 
 conf.q5_15malnf = {
@@ -2128,8 +2128,8 @@ conf.q5_15malnf = {
 		-webengine-proprietary-codecs
 		-no-framework
 		QMAKE_APPLE_DEVICE_ARCHS="arm64 x86_64"
-		NINJAFLAGS="-v -j$(expr $PARALLELNUM / 2)"
 	]],
+	NINJAFLAGS = "-v -j4"
 }
 
 conf.q5_15malsf = {