diff options
| author | Michael Stahl <mstahl@redhat.com> | 2018-01-08 12:31:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-08 12:39:47 +0100 |
| commit | 8f3ca0831993f7d687d7fc0feb1abe0c67a413bd (patch) | |
| tree | e9b9c34a9bd97b15eb65261555d8f357b9ac095f /external/openssl | |
| parent | 65e63f48dac411de9e85ee5d8789f6d1329a0725 (diff) | |
openssl: MSVC build: link and run MSASM with /SAFESEH
Actually the assembler requires lowercase /safeseh, oddly enough.
Change-Id: I1569409a2d6358282a7463ea996a6b1615e6ed8c
Diffstat (limited to 'external/openssl')
| -rw-r--r-- | external/openssl/opensslwnt.patch | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/external/openssl/opensslwnt.patch b/external/openssl/opensslwnt.patch index e22bea6f077b..c5c96dd25700 100644 --- a/external/openssl/opensslwnt.patch +++ b/external/openssl/opensslwnt.patch @@ -79,15 +79,26 @@ diff -ru openssl.orig/util/mk1mf.pl openssl/util/mk1mf.pl APP_CFLAG=$app_cflag LIB_CFLAG=$lib_cflag SHLIB_CFLAG=$shl_cflag -@@ -488,7 +493,7 @@ +@@ -488,8 +493,8 @@ + SRC_D=$src_dir LINK_CMD=$link - LFLAGS=$lflags +-LFLAGS=$lflags ++LFLAGS=$lflags /SAFESEH -RSC=$rsc +RSC=$rsc \$(SOLARINC) # The output directory for everything interesting OUT_D=$out_dir +@@ -511,7 +516,7 @@ + MKDIR=$mkdir + MKLIB=$bin_dir$mklib + MLFLAGS=$mlflags +-ASM=$bin_dir$asm ++ASM=$bin_dir$asm /safeseh + + # FIPS validated module and support file locations + @@ -669,7 +674,7 @@ printf OUT <<EOF; #ifdef $platform_cpp_symbol |