diff options
| author | djm <> | 2011-11-03 02:34:33 +0000 |
|---|---|---|
| committer | djm <> | 2011-11-03 02:34:33 +0000 |
| commit | fc7396568e61a510b9336d6c220aaa889c03060f (patch) | |
| tree | a8fc08e33aecdd21cb07aa47c8a3a9db715f2ef3 /src/lib/libcrypto/util/pl | |
| parent | 1e8701dd2507fadf6d232d93eb4299a8b79c66d5 (diff) | |
| download | openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.gz openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.tar.bz2 openbsd-fc7396568e61a510b9336d6c220aaa889c03060f.zip | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/util/pl')
| -rw-r--r-- | src/lib/libcrypto/util/pl/VC-32.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/util/pl/VC-32.pl b/src/lib/libcrypto/util/pl/VC-32.pl index c3e29fda96..5f25fc41bf 100644 --- a/src/lib/libcrypto/util/pl/VC-32.pl +++ b/src/lib/libcrypto/util/pl/VC-32.pl | |||
| @@ -138,8 +138,8 @@ else | |||
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | # generate symbols.pdb unconditionally | 140 | # generate symbols.pdb unconditionally |
| 141 | $app_cflag.=" /Zi /Fd$tmp_def/app"; | 141 | $app_cflag.=" /Zi /Fd\$(TMP_D)/app"; |
| 142 | $lib_cflag.=" /Zi /Fd$tmp_def/lib"; | 142 | $lib_cflag.=" /Zi /Fd\$(TMP_D)/lib"; |
| 143 | $lflags.=" /debug"; | 143 | $lflags.=" /debug"; |
| 144 | 144 | ||
| 145 | $obj='.obj'; | 145 | $obj='.obj'; |
| @@ -195,7 +195,7 @@ if ($FLAVOR =~ /WIN64A/) { | |||
| 195 | my $ver=`nasm -v 2>NUL`; | 195 | my $ver=`nasm -v 2>NUL`; |
| 196 | my $vew=`nasmw -v 2>NUL`; | 196 | my $vew=`nasmw -v 2>NUL`; |
| 197 | # pick newest version | 197 | # pick newest version |
| 198 | $asm=($ver gt $vew?"nasm":"nasmw")." -f win32"; | 198 | $asm=($ver ge $vew?"nasm":"nasmw")." -f win32"; |
| 199 | $asmtype="win32n"; | 199 | $asmtype="win32n"; |
| 200 | $afile='-o '; | 200 | $afile='-o '; |
| 201 | } else { | 201 | } else { |