Skip to content

Commit

Permalink
deps: exclude linker scripts for windows builds
Browse files Browse the repository at this point in the history
This commit ignore fips.ld and legacy.ld linker scripts for Windows
environments.

PR-URL: #42973
Fixes: #40854
Reviewed-By: Michael Dawson <midawson@redhat.com>
  • Loading branch information
danbev authored and bengl committed May 30, 2022
1 parent df69146 commit ecacc3a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions deps/openssl/config/generate_gypi.pl
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

my $linker_script_dir = "<(PRODUCT_DIR)/../../deps/openssl/config/archs/$arch/$asm/providers";
my $fips_linker_script = "";
if ($fips_ld ne "") {
if ($fips_ld ne "" and not $is_win) {
$fips_linker_script = "$linker_script_dir/fips.ld";
copy("$src_dir/providers/fips.ld",
"$base_dir/providers/fips.ld") or die "Copy failed: $!";
Expand Down Expand Up @@ -195,7 +195,7 @@
}

foreach my $obj (@{$unified_info{sources}->{'providers/legacy'}}) {
if ($obj eq 'providers/legacy.ld') {
if ($obj eq 'providers/legacy.ld' and not $is_win) {
push(@generated_srcs, $obj);
} else {
my $src = ${$unified_info{sources}->{$obj}}[0];
Expand Down Expand Up @@ -238,7 +238,7 @@
}

foreach my $obj (@{$unified_info{sources}->{'providers/fips'}}) {
if ($obj eq 'providers/fips.ld') {
if ($obj eq 'providers/fips.ld' and not $is_win) {
push(@generated_srcs, $obj);
} else {
my $src = ${$unified_info{sources}->{$obj}}[0];
Expand Down

0 comments on commit ecacc3a

Please sign in to comment.