Merge branch 'mergelibs12' into main

1 files changed, 3 insertions, 46 deletions

diff --git a/contrib/go/_std_1.21/src/strings/ya.make b/contrib/go/_std_1.21/src/strings/ya.make
index 9dbdf6f565..edcbabec5e 100644
--- a/contrib/go/_std_1.21/src/strings/ya.make
+++ b/contrib/go/_std_1.21/src/strings/ya.make
@@ -1,28 +1,5 @@
 GO_LIBRARY()
-IF (FALSE)
-    MESSAGE(FATAL this shall never happen)
-
-ELSEIF (OS_LINUX AND ARCH_X86_64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
-ELSEIF (OS_LINUX AND ARCH_ARM64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
+IF (OS_DARWIN AND ARCH_ARM64)
     SRCS(
 		builder.go
 		clone.go
@@ -42,7 +19,7 @@ ELSEIF (OS_DARWIN AND ARCH_X86_64)
 		search.go
 		strings.go
     )
-ELSEIF (OS_DARWIN AND ARCH_ARM64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
     SRCS(
 		builder.go
 		clone.go
@@ -52,7 +29,7 @@ ELSEIF (OS_DARWIN AND ARCH_ARM64)
 		search.go
 		strings.go
     )
-ELSEIF (OS_DARWIN AND ARCH_AARCH64)
+ELSEIF (OS_LINUX AND ARCH_X86_64)
     SRCS(
 		builder.go
 		clone.go
@@ -72,25 +49,5 @@ ELSEIF (OS_WINDOWS AND ARCH_X86_64)
 		search.go
 		strings.go
     )
-ELSEIF (OS_WINDOWS AND ARCH_ARM64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
-ELSEIF (OS_WINDOWS AND ARCH_AARCH64)
-    SRCS(
-		builder.go
-		clone.go
-		compare.go
-		reader.go
-		replace.go
-		search.go
-		strings.go
-    )
 ENDIF()
 END()