Merge OPENSSL_NO_EC{DH,DSA} into OPENSSL_NO_EC

[openssl.git] / util / mklink.pl

diff --git a/util/mklink.pl b/util/mklink.pl
index c8653cecc37852358a936fba593ab2c0af35de30..61db12c68f3156475f4f44e2dde2e01d8be001ee 100755 (executable)
--- a/util/mklink.pl
+++ b/util/mklink.pl
@@ -15,12 +15,14 @@
 # Apart from this, this script should be able to handle even the most
 # pathological cases.
 
+use Cwd;
+
 my $from = shift;
 my @files = @ARGV;
 
 my @from_path = split(/[\\\/]/, $from);
-my $pwd = `pwd`;
-chop($pwd);
+my $pwd = getcwd();
+chomp($pwd);
 my @pwd_path = split(/[\\\/]/, $pwd);
 
 my @to_path = ();
@@ -49,6 +51,7 @@ my $to = join('/', @to_path);
 
 my $file;
 $symlink_exists=eval {symlink("",""); 1};
+if ($^O eq "msys") { $symlink_exists=0 };
 foreach $file (@files) {
     my $err = "";
     if ($symlink_exists) {