Skip to content

Commit dd06b18

Browse files
kyessenovoconnorkyle
authored andcommitted
fips: fix ARM builds (envoyproxy#39163)
Fix FIPS builds on ARM, broken by envoyproxy#38403 Signed-off-by: Kuat Yessenov <kuat@google.com> Signed-off-by: Kyle O'Connor <oconnorkyle@google.com>
1 parent 213798a commit dd06b18

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

bazel/BUILD

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,14 @@ selects.config_setting_group(
535535
],
536536
)
537537

538+
selects.config_setting_group(
539+
name = "boringssl_fips_not_ppc",
540+
match_all = [
541+
":boringssl_fips",
542+
":not_ppc",
543+
],
544+
)
545+
538546
config_setting(
539547
name = "zlib_ng",
540548
constraint_values = [
@@ -581,7 +589,7 @@ alias(
581589
name = "boringssl",
582590
actual = select({
583591
"//bazel:boringssl_fips_ppc": "@aws_lc//:ssl",
584-
"//bazel:boringssl_fips_x86": "@boringssl_fips//:ssl",
592+
"//bazel:boringssl_fips_not_ppc": "@boringssl_fips//:ssl",
585593
"//conditions:default": "@boringssl//:ssl",
586594
}),
587595
)
@@ -590,7 +598,7 @@ alias(
590598
name = "boringcrypto",
591599
actual = select({
592600
"//bazel:boringssl_fips_ppc": "@aws_lc//:crypto",
593-
"//bazel:boringssl_fips_x86": "@boringssl_fips//:crypto",
601+
"//bazel:boringssl_fips_not_ppc": "@boringssl_fips//:crypto",
594602
"//conditions:default": "@boringssl//:crypto",
595603
}),
596604
)
@@ -860,6 +868,14 @@ selects.config_setting_group(
860868
],
861869
)
862870

871+
selects.config_setting_group(
872+
name = "not_ppc",
873+
match_any = [
874+
":not_x86_ppc",
875+
":x86",
876+
],
877+
)
878+
863879
selects.config_setting_group(
864880
name = "not_x86",
865881
match_any = [

0 commit comments

Comments
 (0)