Merge pull request #2277 from vibe-d/rdmd_reliability_workaround

Ignore rdmd failures in the OpenSSL version detection. merged-on-behalf-of: Sönke Ludwig <[email protected]>
vibe-d · Mar 7, 2019 · f0027d7 · f0027d7
2 parents 71a7883 + 43aebf8
commit f0027d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tls/dub.sdl b/tls/dub.sdl
@@ -42,7 +42,7 @@ configuration "openssl" {
 	auto output = dir.buildPath("openssl_version.d");
 	if (!output.exists || output.readText.strip != data.strip)
 		data.toFile(output);
-	'` platform="posix"
+	' || true` platform="posix"
 }
 
 configuration "openssl-1.1" {

diff --git a/tls/vibe/stream/openssl.d b/tls/vibe/stream/openssl.d
@@ -49,7 +49,7 @@ else
 {
 	// Only use the openssl_version file if it has been generated
 	static if (__traits(compiles, {import openssl_version; }))
-		mixin("import openssl_version;");
+		mixin("public import openssl_version : OPENSSL_VERSION;");
 	else
 		// try 1.1.0 as softfallback if old other means failed
 		enum OPENSSL_VERSION = "1.1.0";