diff --git a/e_os.h b/e_os.h index 4440ac28d7fee7900f5ebb5271bfabecc90ee8ea..67638f75340e2668c692444d0c4da91f81398cf7 100644 --- a/e_os.h +++ b/e_os.h @@ -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 b05c4aeed4e255482b5e26dba17c876526da811f..a550523b624a53a0c5ca71e286c48ae26d046bcd 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