Skip to content

Commit ecacc3a

Browse files
danbevbengl
authored andcommitted
deps: exclude linker scripts for windows builds
This commit ignore fips.ld and legacy.ld linker scripts for Windows environments. PR-URL: #42973Fixes: #40854 Reviewed-By: Michael Dawson <[email protected]>
1 parent df69146 commit ecacc3a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎deps/openssl/config/generate_gypi.pl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
my$linker_script_dir = "<(PRODUCT_DIR)/../../deps/openssl/config/archs/$arch/$asm/providers";
104104
my$fips_linker_script = "";
105-
if ($fips_ldne""){
105+
if ($fips_ldne""andnot$is_win){
106106
$fips_linker_script = "$linker_script_dir/fips.ld";
107107
copy("$src_dir/providers/fips.ld",
108108
"$base_dir/providers/fips.ld") ordie"Copy failed: $!";
@@ -195,7 +195,7 @@
195195
}
196196

197197
foreachmy$obj (@{$unified_info{sources}->{'providers/legacy'}}){
198-
if ($objeq'providers/legacy.ld'){
198+
if ($objeq'providers/legacy.ld'andnot$is_win){
199199
push(@generated_srcs, $obj);
200200
} else{
201201
my$src = ${$unified_info{sources}->{$obj}}[0];
@@ -238,7 +238,7 @@
238238
}
239239

240240
foreachmy$obj (@{$unified_info{sources}->{'providers/fips'}}){
241-
if ($objeq'providers/fips.ld'){
241+
if ($objeq'providers/fips.ld'andnot$is_win){
242242
push(@generated_srcs, $obj);
243243
} else{
244244
my$src = ${$unified_info{sources}->{$obj}}[0];

0 commit comments

Comments
(0)