Commit: 95130ebcac8f42fdef00975bf087a07a28bd751e - Fs-scripts (git)

Commit MetaInfo

• Revision: 95130ebcac8f42fdef00975bf087a07a28bd751e (tree)
• Time: 2022-11-12 17:44:56
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

no longer set CC when building OpenSSL for macOS

OpenSSL since 3.0.7 already passes correct argument to clang when building for macOS.

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

Change Summary

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

Incremental Difference

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -608,10 +608,12 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 					ret.envSet.CC = "clang --target=" .. confDetail.clangTriplet
 				end
 			elseif string.sub(conf.hostToConfMap[host], 1, 3) == "mac" then
-				-- OpenSSL build for macOS is not used when building Qt 5. Since build of Qt 4 has been defuncted, this may also be defuncted.
-				-- But you know what? OpenSSL is revived in Qt 6! Seems Strange? It's because that SecureTransport has been deprecated by Apple and won't support TLS 1.3!
-				-- Currently only OpenSSL 3 is building. Since macOS comes with 2 different archtectures, we should distinguish them using CC environment variable
-				ret.envSet.CC = "clang -arch " .. ((host ~= "macOSM1") and "x86_64" or "arm64")
+				-- OpenSSL build for macOS is not used when building Qt 5. SecureTransport is used instead.
+				-- Since build of Qt 4 has been defuncted, this may also be defuncted,,,,, right?
+				-- No! OpenSSL is revived in Qt 6! Seems Strange? It's because that SecureTransport has been deprecated by Apple and won't support TLS 1.3!
+				-- Qt since 6.2 supports multiple SSL backend as Qt plugin. So we are building 2 different backends for macOS - SecureTransport and OpenSSL.
+
+				-- nothing special
 			else
 				error("not supported")
 			end

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -589,7 +589,7 @@ conf.o3mx6 = {
 		shared
 		--prefix=&INSTALLROOT&
 		--openssldir=&INSTALLROOT&/ssl
-		darwin64-x86_64-cc
+		darwin64-x86_64
 		-mmacosx-version-min=10.14
 	]],
 }
@@ -605,7 +605,7 @@ conf.o3ma6 = {
 		shared
 		--prefix=&INSTALLROOT&
 		--openssldir=&INSTALLROOT&/ssl
-		darwin64-arm64-cc
+		darwin64-arm64
 		-mmacosx-version-min=10.14
 	]],
 }