projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Ooops, revert committed conflict.
[openssl.git]
/
Configure
diff --git
a/Configure
b/Configure
index b3220c058f1add55fc798b3faaf8adaaa9ef8834..414f0283ec3b4015b0b79e93327437ea9e426f0f 100755
(executable)
--- a/
Configure
+++ b/
Configure
@@
-1501,7
+1501,7
@@
while (<IN>)
}
else {
s/^CC=.*$/CC= $cc/;
- s/^AR=
.*
/AR= $ar/;
+ s/^AR=
\s*ar
/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
}