aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvadim-xd <vadim-xd@yandex-team.com>2024-12-04 00:00:58 +0300
committervadim-xd <vadim-xd@yandex-team.com>2024-12-04 00:23:19 +0300
commit908795ed4669172c64776ecef0ba9a885789c039 (patch)
tree691ebcd5bf4267fe10a1b915a46046ea7148f0a9
parent3de0a0b2f328a9d19ff6e1c655d8a426a4ffe083 (diff)
downloadydb-908795ed4669172c64776ecef0ba9a885789c039.tar.gz
Restore -Wexceptions
commit_hash:4860bd65c19be4212f1ddf3b492a6aad22f89977
-rw-r--r--build/conf/compilers/gnu_compiler.conf3
-rw-r--r--build/scripts/wrapcc.py24
2 files changed, 16 insertions, 11 deletions
diff --git a/build/conf/compilers/gnu_compiler.conf b/build/conf/compilers/gnu_compiler.conf
index 8dc3e376c7f..1abf0164295 100644
--- a/build/conf/compilers/gnu_compiler.conf
+++ b/build/conf/compilers/gnu_compiler.conf
@@ -71,7 +71,7 @@ when ($CLANG16 == "yes") {
when ($CLANG18 == "yes") {
CFLAGS+=-Wno-array-parameter -Wno-deprecate-lax-vec-conv-all -Wno-unqualified-std-cast-call -Wno-unused-but-set-parameter -Wno-implicit-function-declaration -Wno-int-conversion -Wno-incompatible-function-pointer-types -Wno-address-of-packed-member
CFLAGS+=-Wno-deprecated-this-capture -Wno-c++11-narrowing-const-reference -Wno-missing-field-initializers \
- -Wno-packed-non-pod -Wno-format -Wno-vla-cxx-extension -Wno-invalid-offsetof -Wno-exceptions \
+ -Wno-packed-non-pod -Wno-format -Wno-vla-cxx-extension -Wno-invalid-offsetof \
-Wno-include-angled-in-module-purview -Wno-unused-parameter
when ($MAPSMOBI_BUILD_TARGET == "yes") {
CFLAGS+=-Wno-deprecated-declarations
@@ -236,6 +236,7 @@ _C_CPP_KV_STYLE_PC=pc green
_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} \
--source-file ${input:SRC} \
--source-root ${ARCADIA_ROOT} \
+ --build-root ${ARCADIA_BUILD_ROOT} \
--wrapcc-end
when ($CLANG_TIDY_ARGS || $OPENSOURCE == "yes" || $RAW_COMPILE_CPP_CMD == "yes" ) {
diff --git a/build/scripts/wrapcc.py b/build/scripts/wrapcc.py
index dd849fd6ec3..44dd9d619ac 100644
--- a/build/scripts/wrapcc.py
+++ b/build/scripts/wrapcc.py
@@ -1,27 +1,31 @@
import argparse
-import subprocess
-import sys, os
+import os
+import sys
-WRAPCC_ARGS_END='--wrapcc-end'
+WRAPCC_ARGS_END = '--wrapcc-end'
-def fix(source_file: str, source_root: str):
+
+def fix(source_file: str, source_root: str, build_root: str) -> list[str]:
flags = []
return flags
+
def parse_args():
- delimer = -1
+ delimiter = -1
if WRAPCC_ARGS_END in sys.argv:
- delimer = sys.argv.index(WRAPCC_ARGS_END)
- assert delimer != -1, f"This wrapper should be called with {WRAPCC_ARGS_END} argument."
+ delimiter = sys.argv.index(WRAPCC_ARGS_END)
+ assert delimiter != -1, f"This wrapper should be called with {WRAPCC_ARGS_END} argument."
parser = argparse.ArgumentParser()
parser.add_argument('--source-file', required=True)
parser.add_argument('--source-root', required=True)
- cc_cmd = sys.argv[delimer+1:]
- return parser.parse_args(sys.argv[1:delimer]), cc_cmd
+ parser.add_argument('--build-root', required=True)
+ cc_cmd = sys.argv[delimiter + 1:]
+ return parser.parse_args(sys.argv[1:delimiter]), cc_cmd
+
if __name__ == '__main__':
args, cc_cmd = parse_args()
- cmd = cc_cmd + fix(args.source_file, args.source_root)
+ cmd = cc_cmd + fix(args.source_file, args.source_root, args.build_root)
os.execv(cmd[0], cmd)