소스 검색

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/store"])
 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)