From a50f71868ece56af1be1e37504dc95df7154a90b Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 12 Jun 2014 10:48:24 +0100
Subject: [PATCH] Fix Windows build. (cherry picked from commit
 5f4c5a902b0508eab235adecb34b236cdc0048a5)

---
 util/mk1mf.pl | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 3da139dd32..b05c4aeed4 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -455,10 +455,13 @@ for (;;)
 	}
 close(IN);
 
-# Remove opensslconf.h so it doesn't get updated if we configure a
-# different branch.
-$exheader =~ s/[^ ]+\/opensslconf.h//;
-$header =~ s/[^ ]+\/opensslconf.h//;
+if ($orig_platform eq 'copy')
+	{
+	# Remove opensslconf.h so it doesn't get updated if we configure a
+	# different branch.
+	$exheader =~ s/[^ ]+\/opensslconf.h//;
+	$header =~ s/[^ ]+\/opensslconf.h//;
+	}
 
 if ($fips)
 	{
-- 
2.34.1