diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-18 10:11:26 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-18 10:11:26 +0300 |
| commit | 523174fbd5a4be63d8b01076b7faa6a104110198 (patch) | |
| tree | 93ff9bdcba120a6c413d5c1eac00cfe3fb09f5cf /contrib/libs | |
| parent | 5d9b03f7d5e4d38860ff05886839b0224222da3e (diff) | |
| download | ydb-523174fbd5a4be63d8b01076b7faa6a104110198.tar.gz | |
intermediate changes
ref:25052cf645cf81dd1bfa7b93e702cf4ec8b1db49
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/ya.make | 5 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxabi-parts/ya.make | 5 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/ya.make | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/ya.make b/contrib/libs/cxxsupp/libcxx/ya.make index 100f0137c5..74bd02b691 100644 --- a/contrib/libs/cxxsupp/libcxx/ya.make +++ b/contrib/libs/cxxsupp/libcxx/ya.make @@ -25,6 +25,11 @@ ADDINCL( CXXFLAGS(-D_LIBCPP_BUILDING_LIBRARY) +IF (EXPORT_CMAKE) + # TODO(YMAKE-91) split C_DEFINES core.conf var into parts and avoid libc++ ya.make modification + CXXFLAGS(GLOBAL -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES) +ENDIF() + IF (OS_ANDROID) DEFAULT(CXX_RT "default") IF (ARCH_I686 OR ARCH_ARM7) diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/ya.make b/contrib/libs/cxxsupp/libcxxabi-parts/ya.make index 9965f3bcf0..c697080e4f 100644 --- a/contrib/libs/cxxsupp/libcxxabi-parts/ya.make +++ b/contrib/libs/cxxsupp/libcxxabi-parts/ya.make @@ -32,6 +32,11 @@ NO_UTIL() CFLAGS(-D_LIBCXXABI_BUILDING_LIBRARY) +IF (EXPORT_CMAKE) + # TODO(YMAKE-91) keep flags required for libc++ vendoring in a separate core.conf variable + CXXFLAGS(GLOBAL -nostdinc++) +ENDIF() + SRCDIR(contrib/libs/cxxsupp/libcxxabi) SRCS( diff --git a/contrib/libs/cxxsupp/ya.make b/contrib/libs/cxxsupp/ya.make index 6cd299ac8a..4d2adce431 100644 --- a/contrib/libs/cxxsupp/ya.make +++ b/contrib/libs/cxxsupp/ya.make @@ -11,7 +11,6 @@ OWNER( ) NO_PLATFORM() -DISABLE(OPENSOURCE_EXPORT) IF (NOT USE_STL_SYSTEM) PEERDIR( |