summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-06-12 10:48:24 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-06-12 10:58:12 +0100
commita50f71868ece56af1be1e37504dc95df7154a90b (patch)
treef82ad1d713b279a7cf86c4066d2cf2055d7eae64 /util
parent77a27a5066e8c0975d78be635ed356749a6f16db (diff)
Fix Windows build.
(cherry picked from commit 5f4c5a902b0508eab235adecb34b236cdc0048a5)
Diffstat (limited to 'util')
-rwxr-xr-xutil/mk1mf.pl11
1 files 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)
{