Revision | deb3e7ce0c143274e04fd894bab9e99d2b42fb37 (tree) |
---|---|
Zeit | 2024-03-30 10:43:48 |
Autor | Fs <Fsu0413@vip....> |
Commiter | Fs |
喵
@@ -422,20 +422,20 @@ conf.Qt.generateConfTable = function(self, host, job, buildTime) | ||
422 | 422 | targetToolchainVersion = hostToolchainVersion |
423 | 423 | if string.sub(jobConfigureDetail.toolchain, 1, 4) == "MSVC" then |
424 | 424 | ret.buildTarget = "Windows" |
425 | - if string.sub(jobConfigureDetail.toolchain, -3) = "-32" then | |
425 | + if string.sub(jobConfigureDetail.toolchain, -3) == "-32" then | |
426 | 426 | ret.buildTargetArch = "x86" |
427 | - elseif string.sub(jobConfigureDetail.toolchain, -3) = "-64" then | |
427 | + elseif string.sub(jobConfigureDetail.toolchain, -3) == "-64" then | |
428 | 428 | ret.buildTargetArch = "x86_64" |
429 | - elseif string.sub(jobConfigureDetail.toolchain, -6) = "-arm64" then | |
429 | + elseif string.sub(jobConfigureDetail.toolchain, -6) == "-arm64" then | |
430 | 430 | ret.buildTargetArch = "arm64" |
431 | 431 | end |
432 | 432 | elseif string.sub(jobConfigureDetail.toolchain, 1, 5) == "MinGW" then |
433 | 433 | ret.buildTarget = "Windows" |
434 | - if string.sub(jobConfigureDetail.toolchain, -3) = "-32" then | |
434 | + if string.sub(jobConfigureDetail.toolchain, -3) == "-32" then | |
435 | 435 | ret.buildTargetArch = "x86" |
436 | - elseif string.sub(jobConfigureDetail.toolchain, -3) = "-64" then | |
436 | + elseif string.sub(jobConfigureDetail.toolchain, -3) == "-64" then | |
437 | 437 | ret.buildTargetArch = "x86_64" |
438 | - elseif string.sub(jobConfigureDetail.toolchain, -6) = "-arm64" then | |
438 | + elseif string.sub(jobConfigureDetail.toolchain, -6) == "-arm64" then | |
439 | 439 | ret.buildTargetArch = "arm64" |
440 | 440 | end |
441 | 441 | elseif string.sub(conf.hostToConfMap[host], 1, 3) == "mac" then |
@@ -772,20 +772,20 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
772 | 772 | targetToolchainVersion = hostToolchainVersion |
773 | 773 | if string.sub(jobConfigureDetail.toolchain, 1, 4) == "MSVC" then -- if conf.hostToConfMap[host] == "win" then |
774 | 774 | ret.buildTarget = "Windows" |
775 | - if string.sub(jobConfigureDetail.toolchain, -3) = "-32" then | |
775 | + if string.sub(jobConfigureDetail.toolchain, -3) == "-32" then | |
776 | 776 | ret.buildTargetArch = "x86" |
777 | - elseif string.sub(jobConfigureDetail.toolchain, -3) = "-64" then | |
777 | + elseif string.sub(jobConfigureDetail.toolchain, -3) == "-64" then | |
778 | 778 | ret.buildTargetArch = "x86_64" |
779 | - elseif string.sub(jobConfigureDetail.toolchain, -6) = "-arm64" then | |
779 | + elseif string.sub(jobConfigureDetail.toolchain, -6) == "-arm64" then | |
780 | 780 | ret.buildTargetArch = "arm64" |
781 | 781 | end |
782 | 782 | elseif string.sub(jobConfigureDetail.toolchain, 1, 5) == "MinGW" then -- elseif conf.hostToConfMap[host] == "msys" then |
783 | 783 | ret.buildTarget = "Windows" |
784 | - if string.sub(jobConfigureDetail.toolchain, -3) = "-32" then | |
784 | + if string.sub(jobConfigureDetail.toolchain, -3) == "-32" then | |
785 | 785 | ret.buildTargetArch = "x86" |
786 | - elseif string.sub(jobConfigureDetail.toolchain, -3) = "-64" then | |
786 | + elseif string.sub(jobConfigureDetail.toolchain, -3) == "-64" then | |
787 | 787 | ret.buildTargetArch = "x86_64" |
788 | - elseif string.sub(jobConfigureDetail.toolchain, -6) = "-arm64" then | |
788 | + elseif string.sub(jobConfigureDetail.toolchain, -6) == "-arm64" then | |
789 | 789 | ret.buildTargetArch = "arm64" |
790 | 790 | end |
791 | 791 | -- Clang-llvm need clang be called with target triplet and should be set to environment variable CC |
@@ -951,20 +951,20 @@ conf.MariaDB.generateConfTable = function(self, host, job) | ||
951 | 951 | targetToolchainVersion = hostToolchainVersion |
952 | 952 | if string.sub(jobConfigureDetail.toolchain, 1, 4) == "MSVC" then |
953 | 953 | ret.buildTarget = "Windows" |
954 | - if string.sub(jobConfigureDetail.toolchain, -3) = "-32" then | |
954 | + if string.sub(jobConfigureDetail.toolchain, -3) == "-32" then | |
955 | 955 | ret.buildTargetArch = "x86" |
956 | - elseif string.sub(jobConfigureDetail.toolchain, -3) = "-64" then | |
956 | + elseif string.sub(jobConfigureDetail.toolchain, -3) == "-64" then | |
957 | 957 | ret.buildTargetArch = "x86_64" |
958 | - elseif string.sub(jobConfigureDetail.toolchain, -6) = "-arm64" then | |
958 | + elseif string.sub(jobConfigureDetail.toolchain, -6) == "-arm64" then | |
959 | 959 | ret.buildTargetArch = "arm64" |
960 | 960 | end |
961 | 961 | elseif string.sub(jobConfigureDetail.toolchain, 1, 5) == "MinGW" then |
962 | 962 | ret.buildTarget = "Windows" |
963 | - if string.sub(jobConfigureDetail.toolchain, -3) = "-32" then | |
963 | + if string.sub(jobConfigureDetail.toolchain, -3) == "-32" then | |
964 | 964 | ret.buildTargetArch = "x86" |
965 | - elseif string.sub(jobConfigureDetail.toolchain, -3) = "-64" then | |
965 | + elseif string.sub(jobConfigureDetail.toolchain, -3) == "-64" then | |
966 | 966 | ret.buildTargetArch = "x86_64" |
967 | - elseif string.sub(jobConfigureDetail.toolchain, -6) = "-arm64" then | |
967 | + elseif string.sub(jobConfigureDetail.toolchain, -6) == "-arm64" then | |
968 | 968 | ret.buildTargetArch = "arm64" |
969 | 969 | end |
970 | 970 | elseif string.sub(conf.hostToConfMap[host], 1, 3) == "mac" then |