Intermediate changes

3 files changed, 4 insertions, 113 deletions

diff --git a/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make b/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make
index 357058c18b..0506e8dff4 100644
--- a/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make
+++ b/contrib/go/_std_1.21/src/os/exec/internal/fdtest/ya.make
@@ -1,17 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		exists_unix.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		exists_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		exists_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exists_unix.go
     )
diff --git a/contrib/go/_std_1.21/src/os/exec/ya.make b/contrib/go/_std_1.21/src/os/exec/ya.make
index 0f8000539f..0ac60e62c5 100644
--- a/contrib/go/_std_1.21/src/os/exec/ya.make
+++ b/contrib/go/_std_1.21/src/os/exec/ya.make
@@ -1,23 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
-    SRCS(
-		exec.go
-		exec_unix.go
-		lp_unix.go
-    )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		exec.go
-		exec_unix.go
-		lp_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		exec.go
-		exec_unix.go
-		lp_unix.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64)
     SRCS(
 		exec.go
 		exec_unix.go
diff --git a/contrib/go/_std_1.21/src/os/ya.make b/contrib/go/_std_1.21/src/os/ya.make
index b49d2d94dc..29a4133df4 100644
--- a/contrib/go/_std_1.21/src/os/ya.make
+++ b/contrib/go/_std_1.21/src/os/ya.make
@@ -1,5 +1,5 @@
 GO_LIBRARY()
-IF (OS_DARWIN AND ARCH_ARM64)
+IF (OS_DARWIN AND ARCH_ARM64 OR OS_DARWIN AND ARCH_X86_64)
     SRCS(
 		dir.go
 		dir_darwin.go
@@ -38,86 +38,7 @@ IF (OS_DARWIN AND ARCH_ARM64)
 		types_unix.go
 		wait_unimp.go
     )
-ELSEIF (OS_DARWIN AND ARCH_X86_64)
-    SRCS(
-		dir.go
-		dir_darwin.go
-		endian_little.go
-		env.go
-		error.go
-		error_errno.go
-		error_posix.go
-		exec.go
-		exec_posix.go
-		exec_unix.go
-		executable.go
-		executable_darwin.go
-		file.go
-		file_open_unix.go
-		file_posix.go
-		file_unix.go
-		getwd.go
-		path.go
-		path_unix.go
-		pipe_unix.go
-		proc.go
-		rawconn.go
-		readfrom_stub.go
-		removeall_at.go
-		stat.go
-		stat_darwin.go
-		stat_unix.go
-		sticky_bsd.go
-		str.go
-		sys.go
-		sys_bsd.go
-		sys_unix.go
-		tempfile.go
-		types.go
-		types_unix.go
-		wait_unimp.go
-    )
-ELSEIF (OS_LINUX AND ARCH_AARCH64)
-    SRCS(
-		dir.go
-		dir_unix.go
-		dirent_linux.go
-		endian_little.go
-		env.go
-		error.go
-		error_errno.go
-		error_posix.go
-		exec.go
-		exec_posix.go
-		exec_unix.go
-		executable.go
-		executable_procfs.go
-		file.go
-		file_open_unix.go
-		file_posix.go
-		file_unix.go
-		getwd.go
-		path.go
-		path_unix.go
-		pipe2_unix.go
-		proc.go
-		rawconn.go
-		readfrom_linux.go
-		removeall_at.go
-		stat.go
-		stat_linux.go
-		stat_unix.go
-		sticky_notbsd.go
-		str.go
-		sys.go
-		sys_linux.go
-		sys_unix.go
-		tempfile.go
-		types.go
-		types_unix.go
-		wait_waitid.go
-    )
-ELSEIF (OS_LINUX AND ARCH_X86_64)
+ELSEIF (OS_LINUX AND ARCH_AARCH64 OR OS_LINUX AND ARCH_X86_64)
     SRCS(
 		dir.go
 		dir_unix.go