aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2023-08-06 04:41:04 +0300
committersnermolaev <snermolaev@yandex-team.com>2023-08-06 05:45:07 +0300
commit9c2493bf82848dd170c275c3d7577021caad5bcb (patch)
treef00cfb7c18d9d86de46dc4dfb2eb9cb0c2353ba4
parent7f8be7d8fbde4c3cdef4cb31b3c6a94fef90753b (diff)
downloadydb-9c2493bf82848dd170c275c3d7577021caad5bcb.tar.gz
change module prefix for PY3_LIBRARY to libpy3
-rw-r--r--build/conf/python.conf10
-rw-r--r--build/ymake.core.conf18
2 files changed, 2 insertions, 26 deletions
diff --git a/build/conf/python.conf b/build/conf/python.conf
index dd79062fde..2fd375362c 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -537,10 +537,10 @@ module PY3_LIBRARY: _LIBRARY {
PEERDIR+=contrib/libs/python
}
when ($MSVC == "yes" || $CYGWIN == "yes") {
- MODULE_PREFIX=py
+ MODULE_PREFIX=py3
}
otherwise {
- MODULE_PREFIX=libpy
+ MODULE_PREFIX=libpy3
}
.ALLOWED=FORK_TESTS
.IGNORED=GENERATE_ENUM_SERIALIZATION GENERATE_ENUM_SERIALIZATION_WITH_HEADER
@@ -953,12 +953,6 @@ multimodule PY23_LIBRARY {
module PY3: PY3_LIBRARY {
.RESTRICTED=RUN_ANTLR4_PYTHON
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
- when ($MSVC == "yes" || $CYGWIN == "yes") {
- MODULE_PREFIX=py3
- }
- otherwise {
- MODULE_PREFIX=libpy3
- }
OBJ_SUF=.py3
}
}
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 0df2df4e28..02e0bf6306 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -3015,12 +3015,6 @@ multimodule SANDBOX_PY23_TASK {
}
module PY3: PY3_LIBRARY {
.RESTRICTED=RUN_ANTLR4_PYTHON
- when ($MSVC == "yes" || $CYGWIN == "yes") {
- MODULE_PREFIX=py3
- }
- otherwise {
- MODULE_PREFIX=libpy3
- }
OBJ_SUF=.py3
RUN_CYTHON_SCRIPT_H=$YMAKE_PYTHON $CYTHON_SCRIPT
PEERDIR(sandbox/sdk2)
@@ -5785,12 +5779,6 @@ multimodule PROTO_LIBRARY {
SET(PEERDIR_TAGS PY3 PY3_PROTO)
ENABLE(PY3_PROTO)
OPTIMIZE_PY_PROTOS()
- when ($MSVC == "yes" || $CYGWIN == "yes") {
- MODULE_PREFIX=py3
- }
- otherwise {
- MODULE_PREFIX=libpy3
- }
OBJ_SUF=.py3
# Can not use NO_LINT(), because is not allowed outside of contrib directory
SET(_NO_LINT_VALUE none_internal)
@@ -5932,12 +5920,6 @@ multimodule FBS_LIBRARY {
SET(PEERDIR_TAGS PY3 PY3_FBS)
# Can not use NO_LINT(), because is not allowed outside of contrib directory
SET(_NO_LINT_VALUE none_internal)
- when ($MSVC == "yes" || $CYGWIN == "yes") {
- MODULE_PREFIX=py3
- }
- otherwise {
- MODULE_PREFIX=libpy3
- }
OBJ_SUF=.py3
}
}