Intermediate changes

commit_hash:f3c08bb9c83e0ffb888707f2cfccc7063aecafec

3 files changed, 31 insertions, 5 deletions

diff --git a/contrib/python/cryptography/next/rust/.yandex_meta/build.ym b/contrib/python/cryptography/next/rust/.yandex_meta/build.ym
index 358444de78b..27c37abb849 100644
--- a/contrib/python/cryptography/next/rust/.yandex_meta/build.ym
+++ b/contrib/python/cryptography/next/rust/.yandex_meta/build.ym
@@ -11,8 +11,10 @@ devtools/yamaker/libym2/scripts/python3
 
 {% block platforms %}
 x86_64-unknown-linux-gnu
+aarch64-unknown-linux-gnu
 x86_64-unknown-linux-musl
 x86_64-apple-darwin
+aarch64-apple-darwin
 {% endblock %}
 
 {% block msan_platforms %}
@@ -36,8 +38,12 @@ sed -e 's|cdylib|staticlib|' -i Cargo.toml
 {% for p in self.platforms().strip().split('\n') %}
 export CC_{{p.replace('-', '_')}}=target-cc
 {% endfor %}
+export CC_aarch64_unknown_linux_gnu=target-cc-aarch
 export CC_x86_64_unknown_linux_musl=musl-gcc
+
 export CC_x86_64_apple_darwin=mac-target-cc
+export CC_aarch64_apple_darwin=mac-target-cc-arm
+
 export DEP_OPENSSL_INCLUDE={{arcadia_root}}/contrib/libs/openssl/include
 export PYO3_CROSS_PYTHON_VERSION=3.12
 
@@ -160,16 +166,21 @@ cat << EOF > ${BIN}/target-cc
 exec ${CLANG} -DUSE_PYTHON3 -I{{arcadia_root}} -I{{arcadia_root}}/contrib/libs/python/Include -I{{arcadia_root}}/contrib/libs/openssl/include -x c "\${@}"
 EOF
 
+cat << EOF > ${BIN}/target-cc-aarch
+#!/usr/bin/env sh
+exec ${BIN}/target-cc -nostdinc -target aarch64-unknown-linux-gnu -I{{arcadia_root}}/contrib/libs/musl/include -I{{arcadia_root}}/contrib/libs/musl/arch/aarch64 -I{{arcadia_root}}/contrib/libs/musl/arch/generic "\${@}"
+EOF
+
 cat << EOF > ${BIN}/target-cc-msan
 #!/usr/bin/env sh
 exec ${CLANG} -DUSE_PYTHON3 -fsanitize=memory -I{{arcadia_root}} -I{{arcadia_root}}/contrib/libs/python/Include -I{{arcadia_root}}/contrib/libs/openssl/include -x c "\${@}"
 EOF
 
-chmod +x ${BIN}/musl-gcc ${BIN}/target-cc ${BIN}/target-cc-msan
+chmod +x ${BIN}/musl-gcc ${BIN}/target-cc ${BIN}/target-cc-aarch ${BIN}/target-cc-msan
 
 # macOS
 
-cat << EOF > ${BIN}/mac-target-cc
+cat << EOF > ${BIN}/mac-target
 #!/bin/bash
 FILTERED_ARGS=()
 SKIP_NEXT=0
@@ -189,8 +200,19 @@ for arg in "\$@"; do
       ;;
   esac
 done
-exec ${CLANG} -target x86_64-apple-darwin -isysroot ${MACOS_SDK} -DUSE_PYTHON3 -I{{arcadia_root}} -I{{arcadia_root}}/contrib/libs/python/Include -I{{arcadia_root}}/contrib/libs/openssl/include -x c "\${FILTERED_ARGS[@]}"
+exec ${CLANG} -isysroot ${MACOS_SDK} -DUSE_PYTHON3 -I{{arcadia_root}} -I{{arcadia_root}}/contrib/libs/python/Include -I{{arcadia_root}}/contrib/libs/openssl/include -x c "\${FILTERED_ARGS[@]}"
+EOF
+
+cat << EOF > ${BIN}/mac-target-cc
+#!/bin/bash
+exec ${BIN}/mac-target -target x86_64-apple-darwin "\${@}"
 EOF
-chmod +x ${BIN}/mac-target-cc
+
+cat << EOF > ${BIN}/mac-target-cc-arm
+#!/bin/bash
+exec ${BIN}/mac-target -target aarch64-apple-darwin "\${@}"
+EOF
+
+chmod +x ${BIN}/mac-target ${BIN}/mac-target-cc ${BIN}/mac-target-cc-arm
 
 {% endblock %}
diff --git a/contrib/python/cryptography/next/rust/ya.make b/contrib/python/cryptography/next/rust/ya.make
index 2f33da3692a..607916aaab1 100644
--- a/contrib/python/cryptography/next/rust/ya.make
+++ b/contrib/python/cryptography/next/rust/ya.make
@@ -24,10 +24,14 @@ ELSEIF (OS_LINUX AND ARCH_X86_64 AND NOT MUSL AND SANITIZER_TYPE == "memory")
     )
 ELSEIF (OS_LINUX AND ARCH_X86_64 AND NOT MUSL)
     COPY_FILE(a/x86_64-unknown-linux-gnu/release/libcryptography_rust.a libcryptography_rust.a)
+ELSEIF (OS_LINUX AND ARCH_AARCH64)
+    COPY_FILE(a/aarch64-unknown-linux-gnu/release/libcryptography_rust.a libcryptography_rust.a)
 ELSEIF (OS_LINUX AND ARCH_X86_64 AND MUSL)
     COPY_FILE(a/x86_64-unknown-linux-musl/release/libcryptography_rust.a libcryptography_rust.a)
 ELSEIF (OS_DARWIN AND ARCH_X86_64)
     COPY_FILE(a/x86_64-apple-darwin/release/libcryptography_rust.a libcryptography_rust.a)
+ELSEIF (OS_DARWIN AND ARCH_ARM64)
+    COPY_FILE(a/aarch64-apple-darwin/release/libcryptography_rust.a libcryptography_rust.a)
 ELSE()
     MESSAGE(FATAL_ERROR "We don't have cryptography_rust for this platform")
 ENDIF()
diff --git a/contrib/python/cryptography/ya.make b/contrib/python/cryptography/ya.make
index f4929a01e6a..a986a580ce9 100644
--- a/contrib/python/cryptography/ya.make
+++ b/contrib/python/cryptography/ya.make
@@ -7,7 +7,7 @@ VERSION(Service-proxy-version)
 IF (PYTHON2)
     PEERDIR(contrib/python/cryptography/py2)
 ELSE()
-    IF (ARCH_X86_64 AND OS_LINUX OR ARCH_X86_64 AND OS_DARWIN)
+    IF (OS_LINUX AND ARCH_X86_64 OR OS_DARWIN AND ARCH_X86_64 OR OS_LINUX AND ARCH_AARCH64 OR OS_DARWIN AND ARCH_ARM64)
         PEERDIR(contrib/python/cryptography/next)
     ELSE()
         PEERDIR(contrib/python/cryptography/py3)