aboutsummaryrefslogtreecommitdiffstats
path: root/build/platform/clang
diff options
context:
space:
mode:
authororivej <orivej@yandex-team.ru>2022-02-10 16:44:49 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:44:49 +0300
commit718c552901d703c502ccbefdfc3c9028d608b947 (patch)
tree46534a98bbefcd7b1f3faa5b52c138ab27db75b7 /build/platform/clang
parente9656aae26e0358d5378e5b63dcac5c8dbe0e4d0 (diff)
downloadydb-718c552901d703c502ccbefdfc3c9028d608b947.tar.gz
Restoring authorship annotation for <orivej@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/platform/clang')
-rw-r--r--build/platform/clang/arch.cmake54
-rwxr-xr-xbuild/platform/clang/clang-windows.sh62
-rw-r--r--build/platform/clang/ya.make28
3 files changed, 72 insertions, 72 deletions
diff --git a/build/platform/clang/arch.cmake b/build/platform/clang/arch.cmake
index db0ae243e6..b4017fb999 100644
--- a/build/platform/clang/arch.cmake
+++ b/build/platform/clang/arch.cmake
@@ -1,27 +1,27 @@
-# See https://github.com/llvm/llvm-project/blob/master/compiler-rt/cmake/builtin-config-ix.cmake
-
-IF (ARCH_I386 OR ARCH_I686)
- SET(CLANG_ARCH i386)
-ELSEIF (ARCH_X86_64)
- SET(CLANG_ARCH x86_64)
-ELSEIF (ARCH_ARM7 OR ARCH_ARM7_NEON)
- SET(CLANG_ARCH armv7)
-ELSEIF (ARCH_ARM64 OR ARCH_AARCH64)
- IF (OS_DARWIN OR OS_IOS)
- SET(CLANG_ARCH arm64)
- ELSE()
- SET(CLANG_ARCH aarch64)
- ENDIF()
-ELSEIF (ARCH_PPC64LE)
- SET(CLANG_ARCH powerpc64le)
-ELSE()
- MESSAGE(FATAL_ERROR "Unknown architecture")
-ENDIF()
-
-IF (OS_DARWIN)
- SET(CLANG_RT_SUFFIX "_osx")
- SET(CLANG_RT_DLLSUFFIX "_osx_dynamic")
-ELSE()
- SET(CLANG_RT_SUFFIX "-${CLANG_ARCH}")
- SET(CLANG_RT_DLLSUFFIX "-${CLANG_ARCH}")
-ENDIF()
+# See https://github.com/llvm/llvm-project/blob/master/compiler-rt/cmake/builtin-config-ix.cmake
+
+IF (ARCH_I386 OR ARCH_I686)
+ SET(CLANG_ARCH i386)
+ELSEIF (ARCH_X86_64)
+ SET(CLANG_ARCH x86_64)
+ELSEIF (ARCH_ARM7 OR ARCH_ARM7_NEON)
+ SET(CLANG_ARCH armv7)
+ELSEIF (ARCH_ARM64 OR ARCH_AARCH64)
+ IF (OS_DARWIN OR OS_IOS)
+ SET(CLANG_ARCH arm64)
+ ELSE()
+ SET(CLANG_ARCH aarch64)
+ ENDIF()
+ELSEIF (ARCH_PPC64LE)
+ SET(CLANG_ARCH powerpc64le)
+ELSE()
+ MESSAGE(FATAL_ERROR "Unknown architecture")
+ENDIF()
+
+IF (OS_DARWIN)
+ SET(CLANG_RT_SUFFIX "_osx")
+ SET(CLANG_RT_DLLSUFFIX "_osx_dynamic")
+ELSE()
+ SET(CLANG_RT_SUFFIX "-${CLANG_ARCH}")
+ SET(CLANG_RT_DLLSUFFIX "-${CLANG_ARCH}")
+ENDIF()
diff --git a/build/platform/clang/clang-windows.sh b/build/platform/clang/clang-windows.sh
index 73552e62c8..ca6c7c28ed 100755
--- a/build/platform/clang/clang-windows.sh
+++ b/build/platform/clang/clang-windows.sh
@@ -1,31 +1,31 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-version="${1:-11.0.0}"
-major="${version%%.*}"
-
-arcadia="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../../.. && pwd)"
-tmp="${TMPDIR:-/tmp}/clang"
-exe="LLVM-${version}-win64.exe"
-dir="clang-${version}-win"
-tar="${dir}.tar.gz"
-
-set -x
-
-mkdir -p "$tmp"
-cd "$tmp"
-test -e "$exe" || wget "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${exe}"
-
-rm -rf "$dir"
-mkdir -p "$dir"
-cd "$dir"
-7z x ../"$exe"
-
-"$arcadia"/ya \
- make "$arcadia"/contrib/libs/llvm${major}/tools/{llvm-as,llvm-link,opt} \
- -DNO_DEBUGINFO -r --target-platform=windows --no-src-links -I bin
-
-tar czf "../$tar" *
-
-printf '%q ' ya upload "$tmp/$tar" -d "Clang $version for Windows" --ttl inf --owner BUILD_TOOLS --type CLANG_TOOLKIT --attr platform=win32 --attr "version=$version"
-echo
+#!/usr/bin/env bash
+set -euo pipefail
+
+version="${1:-11.0.0}"
+major="${version%%.*}"
+
+arcadia="$(cd "$(dirname "${BASH_SOURCE[0]}")"/../../.. && pwd)"
+tmp="${TMPDIR:-/tmp}/clang"
+exe="LLVM-${version}-win64.exe"
+dir="clang-${version}-win"
+tar="${dir}.tar.gz"
+
+set -x
+
+mkdir -p "$tmp"
+cd "$tmp"
+test -e "$exe" || wget "https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/${exe}"
+
+rm -rf "$dir"
+mkdir -p "$dir"
+cd "$dir"
+7z x ../"$exe"
+
+"$arcadia"/ya \
+ make "$arcadia"/contrib/libs/llvm${major}/tools/{llvm-as,llvm-link,opt} \
+ -DNO_DEBUGINFO -r --target-platform=windows --no-src-links -I bin
+
+tar czf "../$tar" *
+
+printf '%q ' ya upload "$tmp/$tar" -d "Clang $version for Windows" --ttl inf --owner BUILD_TOOLS --type CLANG_TOOLKIT --attr platform=win32 --attr "version=$version"
+echo
diff --git a/build/platform/clang/ya.make b/build/platform/clang/ya.make
index 342b928637..f39b8e9a77 100644
--- a/build/platform/clang/ya.make
+++ b/build/platform/clang/ya.make
@@ -4,21 +4,21 @@ LICENSE(BSD-3-Clause)
OWNER(g:contrib)
-IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX)
- DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
- CLANG # Clang 10
- sbr:1871274282 FOR LINUX
- sbr:1844539535 FOR DARWIN
- )
-ELSE()
+IF (CLANG10BC AND CLANG10 AND HOST_OS_LINUX)
+ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+ CLANG # Clang 10
+ sbr:1871274282 FOR LINUX
+ sbr:1844539535 FOR DARWIN
+ )
+ELSE()
# Remove -std=c++17 flag from LLVM_COMPILE_CXX and CLANG_EMIT_AST_CXX macro when update clang to 11
# DEVTOOLS-7845
- DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
- CLANG # Clang 7
- sbr:707372498 FOR LINUX # In 942524429 and 958916803 llvm-link does not run.
- sbr:942053644 FOR DARWIN
- sbr:1006151596 FOR WIN32 # Generated by ./clang-windows.sh 7.1.0
- )
-ENDIF()
+ DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
+ CLANG # Clang 7
+ sbr:707372498 FOR LINUX # In 942524429 and 958916803 llvm-link does not run.
+ sbr:942053644 FOR DARWIN
+ sbr:1006151596 FOR WIN32 # Generated by ./clang-windows.sh 7.1.0
+ )
+ENDIF()
END()