projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77a27a5
)
Fix Windows build.
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 12 Jun 2014 09:48:24 +0000
(10:48 +0100)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 12 Jun 2014 09:58:12 +0000
(10:58 +0100)
(cherry picked from commit
5f4c5a902b0508eab235adecb34b236cdc0048a5
)
util/mk1mf.pl
patch
|
blob
|
history
diff --git
a/util/mk1mf.pl
b/util/mk1mf.pl
index 3da139dd326d21d7a2c4dc27dad4ee093745099c..b05c4aeed4e255482b5e26dba17c876526da811f 100755
(executable)
--- 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)
{