瀏覽代碼

Merge pull request #4626 from akien-mga/pr-msvc-build

Windows: Fix MinGW argument being passed to MSVC
Rémi Verschelde 9 年之前
父節點
當前提交
eb64a8d373
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      drivers/builtin_openssl2/SCsub

+ 5 - 3
drivers/builtin_openssl2/SCsub

@@ -650,8 +650,10 @@ env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
 env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
 env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
 #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
 #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
 env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
 env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
-env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]);
-
-env_ssl.add_source_files(env.drivers_sources,openssl_sources)
 
 
+# Workaround for compilation error with MinGW
+import os
+if (os.name=="nt" and os.getenv("VSINSTALLDIR")==None): # Windows and not MSVC, so likely MinGW
+	env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]);
 
 
+env_ssl.add_source_files(env.drivers_sources,openssl_sources)