aboutsummaryrefslogtreecommitdiffstats
path: root/build/platform
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.ru>2022-02-10 16:45:53 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:45:53 +0300
commit2015790ac9fcc04caab83fccc23ab2460310a797 (patch)
treee644e9bc3f6f688561a871793b59bf8a637e0f72 /build/platform
parentc768a99151e47c3a4bb7b92c514d256abd301c4d (diff)
downloadydb-2015790ac9fcc04caab83fccc23ab2460310a797.tar.gz
Restoring authorship annotation for <snermolaev@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'build/platform')
-rw-r--r--build/platform/bfd/ya.make2
-rw-r--r--build/platform/cuda/ya.make44
-rw-r--r--build/platform/gold/ya.make2
-rw-r--r--build/platform/linux_sdk/ya.make10
-rw-r--r--build/platform/lld/ya.make2
-rw-r--r--build/platform/python/ldflags/ya.make2
-rw-r--r--build/platform/python/ya.make2
7 files changed, 32 insertions, 32 deletions
diff --git a/build/platform/bfd/ya.make b/build/platform/bfd/ya.make
index 67501f665f..65f10dbd3c 100644
--- a/build/platform/bfd/ya.make
+++ b/build/platform/bfd/ya.make
@@ -4,6 +4,6 @@ OWNER(somov)
INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource)
-LDFLAGS(-fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.bfd)
+LDFLAGS(-fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.bfd)
END()
diff --git a/build/platform/cuda/ya.make b/build/platform/cuda/ya.make
index 3615f682cd..def63ead0b 100644
--- a/build/platform/cuda/ya.make
+++ b/build/platform/cuda/ya.make
@@ -38,18 +38,18 @@ IF (USE_ARCADIA_CUDA)
ENABLE(CUDA_NOT_FOUND)
ENDIF()
- ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
- IF (OS_LINUX AND ARCH_PPC64LE)
+ ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
+ IF (OS_LINUX AND ARCH_PPC64LE)
IF (CUDA_VERSION == "10.1")
- DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1586537264) # CUDA Toolkit 10.1.168 for Linux ppc64le
- ELSE()
- ENABLE(CUDA_NOT_FOUND)
- ENDIF()
-
- ELSE()
- ENABLE(CUDA_NOT_FOUND)
- ENDIF()
-
+ DECLARE_EXTERNAL_RESOURCE(CUDA sbr:1586537264) # CUDA Toolkit 10.1.168 for Linux ppc64le
+ ELSE()
+ ENABLE(CUDA_NOT_FOUND)
+ ENDIF()
+
+ ELSE()
+ ENABLE(CUDA_NOT_FOUND)
+ ENDIF()
+
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
IF (OS_DARWIN AND ARCH_X86_64)
IF (CUDA_VERSION == "10.1")
@@ -95,18 +95,18 @@ IF (USE_ARCADIA_CUDA_HOST_COMPILER)
ENABLE(CUDA_HOST_COMPILER_NOT_FOUND)
ENDIF()
- ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
- IF (OS_LINUX AND ARCH_PPC64LE)
+ ELSEIF (HOST_OS_LINUX AND HOST_ARCH_PPC64LE)
+ IF (OS_LINUX AND ARCH_PPC64LE)
IF (CUDA_VERSION == "10.1")
- DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1566513994) # Clang 7.0 for Linux ppc64le (not latest)
- ELSE()
- ENABLE(CUDA_HOST_COMPILER_NOT_FOUND)
- ENDIF()
-
- ELSE()
- ENABLE(CUDA_HOST_COMPILER_NOT_FOUND)
- ENDIF()
-
+ DECLARE_EXTERNAL_RESOURCE(CUDA_HOST_TOOLCHAIN sbr:1566513994) # Clang 7.0 for Linux ppc64le (not latest)
+ ELSE()
+ ENABLE(CUDA_HOST_COMPILER_NOT_FOUND)
+ ENDIF()
+
+ ELSE()
+ ENABLE(CUDA_HOST_COMPILER_NOT_FOUND)
+ ENDIF()
+
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
IF (OS_DARWIN AND ARCH_X86_64)
SET(__XCODE_RESOURCE_NAME CUDA_HOST_TOOLCHAIN)
diff --git a/build/platform/gold/ya.make b/build/platform/gold/ya.make
index 91f01602f7..7669471ce0 100644
--- a/build/platform/gold/ya.make
+++ b/build/platform/gold/ya.make
@@ -4,7 +4,7 @@ OWNER(somov)
INCLUDE(${ARCADIA_ROOT}/build/platform/binutils/binutils.resource)
-LDFLAGS(
+LDFLAGS(
-fuse-ld=$BINUTILS_ROOT_RESOURCE_GLOBAL/bin/ld.gold
-Wl,-z,noexecstack
)
diff --git a/build/platform/linux_sdk/ya.make b/build/platform/linux_sdk/ya.make
index add74eee9e..78ec009ae8 100644
--- a/build/platform/linux_sdk/ya.make
+++ b/build/platform/linux_sdk/ya.make
@@ -32,11 +32,11 @@ ELSEIF (ARCH_AARCH64)
ENDIF()
ELSEIF (ARCH_PPC64LE)
IF (OS_SDK == "ubuntu-14")
- IF (HOST_ARCH_PPC64LE)
- DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1570528338)
- ELSE()
- DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:233217651)
- ENDIF()
+ IF (HOST_ARCH_PPC64LE)
+ DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1570528338)
+ ELSE()
+ DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:233217651)
+ ENDIF()
ELSE()
MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for PPC64LE")
ENDIF()
diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make
index c046e89098..65b9f80caf 100644
--- a/build/platform/lld/ya.make
+++ b/build/platform/lld/ya.make
@@ -54,7 +54,7 @@ ELSE()
ELSE()
DECLARE_EXTERNAL_RESOURCE(LLD_ROOT sbr:2283429958)
ENDIF()
- ENDIF()
+ ENDIF()
LDFLAGS("-fuse-ld=$LLD_ROOT_RESOURCE_GLOBAL/ld" "-Wl,--no-rosegment")
ENDIF()
diff --git a/build/platform/python/ldflags/ya.make b/build/platform/python/ldflags/ya.make
index d81ec31876..d44be05017 100644
--- a/build/platform/python/ldflags/ya.make
+++ b/build/platform/python/ldflags/ya.make
@@ -11,7 +11,7 @@ IF (USE_SYSTEM_PYTHON)
LDFLAGS("/LIBPATH:$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/libs")
ENDIF()
ELSEIF (NOT USE_ARCADIA_PYTHON)
- LDFLAGS($PYTHON_LDFLAGS $PYTHON_LIBRARIES)
+ LDFLAGS($PYTHON_LDFLAGS $PYTHON_LIBRARIES)
ENDIF()
END()
diff --git a/build/platform/python/ya.make b/build/platform/python/ya.make
index 247e65f4c9..a6f58e0487 100644
--- a/build/platform/python/ya.make
+++ b/build/platform/python/ya.make
@@ -125,7 +125,7 @@ IF (USE_SYSTEM_PYTHON)
ELSEIF (NOT USE_ARCADIA_PYTHON)
CFLAGS(GLOBAL $PYTHON_FLAGS)
IF (OS_WINDOWS)
- LDFLAGS($PYTHON_LDFLAGS $PYTHON_LIBRARIES)
+ LDFLAGS($PYTHON_LDFLAGS $PYTHON_LIBRARIES)
ENDIF()
ENDIF()