Skip to content

Commit d8dfdbf

Browse files
authored
Merge pull request #12445 from ydb-platform/mergelibs-241210-0813
Library import 241210-0813
2 parents 68a09a0 + 0087d86 commit d8dfdbf

File tree

2,850 files changed

+30665
-25735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,850 files changed

+30665
-25735
lines changed

build/conf/compilers/gnu_compiler.conf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ when ($CLANG == "yes") {
2424
}
2525

2626
_DEBUG_INFO_FLAGS=-g
27-
when ($OS_LINUX == "yes") {
28-
_DEBUG_INFO_FLAGS=-g -ggnu-pubnames
29-
# Clang's more accurate debug info for sampling-PGO purposes. PGO only makes sense in release builds
30-
when ($CLANG == "yes" && $_BUILD_RELEASE == "yes") {
31-
_DEBUG_INFO_FLAGS+=-fdebug-info-for-profiling
27+
when ($CLANG == "yes") {
28+
_DEBUG_INFO_FLAGS+=-fdebug-default-version=4
29+
when ($OS_LINUX == "yes") {
30+
_DEBUG_INFO_FLAGS+=-ggnu-pubnames
31+
when ($_BUILD_RELEASE == "yes") {
32+
# Clang's more accurate debug info for sampling-PGO purposes. PGO only makes sense in release builds
33+
_DEBUG_INFO_FLAGS+=-fdebug-info-for-profiling
34+
}
3235
}
3336
}
3437

@@ -111,7 +114,6 @@ CXXFLAGS+=$CFLAGS $_STD_CXX $CXX_WARNING_OPTS $USER_CXXFLAGS $USER_CXXFLAGS_GLOB
111114
CONLYFLAGS+=$USER_CONLYFLAGS $USER_CONLYFLAGS_GLOBAL
112115
NOGCCSTACKCHECK=yes
113116
SFDL_FLAG=$_SFDL_FLAGS -o $SFDL_TMP_OUT
114-
WERROR_FLAG=-Werror
115117
DEBUG_INFO_FLAGS=$_DEBUG_INFO_FLAGS
116118

117119
when ($NO_WSHADOW == "yes") {

build/conf/compilers/msvc_compiler.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ when ($NO_OPTIMIZE == "yes") {
7272
}
7373

7474
SFDL_FLAG=/E /C /P /TP /Fi$SFDL_TMP_OUT
75-
WERROR_FLAG=/WX
7675

7776
CL_WRAPPER=${FIX_MSVC_OUTPUT} cl
7877
when ($_UNDER_WINE_COMPILER == "yes" || $CLANG_CL == "yes") {

build/export_generators/gradle/build.gradle.kts.jinja

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{%- set publish = target.publish -%}
22
{%- set mainClass = target.app_main_class -%}
3-
{%- set hasJunit5Test = extra_targets|selectattr('junit5_test') -%}
3+
{%- set has_junit5_test = extra_targets|selectattr('junit5_test') -%}
44
plugins {
55
{% if mainClass -%}
66
`application`
@@ -34,7 +34,7 @@ java {
3434
}
3535

3636
dependencies {
37-
{% if hasJunit5Test -%}
37+
{% if has_junit5_test -%}
3838
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
3939
api("org.apache.commons:commons-math3:3.6.1")
4040
api("com.google.guava:guava:31.0.1-jre")
@@ -71,7 +71,7 @@ dependencies {
7171
{% endfor -%}
7272
}
7373

74-
{% if hasJunit5Test -%}
74+
{% if has_junit5_test -%}
7575
tasks.named<Test>("test") {
7676
useJUnitPlatform()
7777
}

0 commit comments

Comments
 (0)