diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-07-01 14:11:28 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-07-01 14:11:28 +0100 |
| commit | 70857a4a004dd10345e6c8397734bda4dc4bdad7 (patch) | |
| tree | 4d673b9b6a5b113515239fcbddcc21f8cdae458f | |
| parent | 2580ab4ed700fbb0c3664c1e7696dea1afd4d68a (diff) | |
Windows build fixes.
| -rw-r--r-- | e_os.h | 1 | ||||
| -rwxr-xr-x | util/mk1mf.pl | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -134,6 +134,7 @@ extern "C" { #endif #ifdef WIN32 +#define NO_SYS_UN_H #define get_last_sys_error() GetLastError() #define clear_sys_error() SetLastError(0) #if !defined(WINNT) diff --git a/util/mk1mf.pl b/util/mk1mf.pl index b05c4aeed4..a550523b62 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -617,6 +617,8 @@ EOF $ex_libs .= " $zlib_lib" if $zlib_opt == 1; } +my $asm_def = $orig_platform eq 'copy' ? "" : "ASM=$bin_dir$asm"; + $defs= <<"EOF"; # N.B. You MUST use -j on FreeBSD. # This makefile has been automatically generated from the OpenSSL distribution. @@ -677,7 +679,7 @@ RANLIB=$ranlib MKDIR=$mkdir MKLIB=$bin_dir$mklib MLFLAGS=$mlflags -#ASM=$bin_dir$asm +$asm_def # FIPS validated module and support file locations |