Fix dump compile commands & improve wrapcc

commit_hash:a205838b61e595c9e2e5ca27cd6bca2bc5fd0ee9

Author: Nechda

build/conf/compilers/gnu_compiler.conf

@@ -225,17 +225,22 @@ _C_CPP_KV_STYLE_NEW=${hide;kv:_C_CPP_KV_STYLE_P} ${hide;kv:_C_CPP_KV_STYLE_PC}
 _C_CPP_KV_STYLE_P=p CC
 _C_CPP_KV_STYLE_PC=pc green
 
-_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} ${input:SRC}
-when ($CLANG_TIDY_ARGS || $RETRY_ARGS || $YNDEXER_ARGS || $OPENSOURCE == "yes" || $RAW_COMPILE_CPP_CMD == "yes" ) {
+# --wrapcc-end argument must be the last one
+_C_CPP_WRAPPER=$YMAKE_PYTHON3 ${input:"build/scripts/wrapcc.py"} \
+    --source-file ${input:SRC} \
+    --source-root ${ARCADIA_ROOT} \
+    --wrapcc-end
+
+when ($CLANG_TIDY_ARGS || $OPENSOURCE == "yes" || $RAW_COMPILE_CPP_CMD == "yes" ) {
     _C_CPP_WRAPPER=
 }
 
 _CPP_ARGS_NEW=\
     $CLANG_STATIC_ANALYZER_OPTIONS_NEW && \
     $CLANG_TIDY_ARGS \
+    $_C_CPP_WRAPPER \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
-    $_C_CPP_WRAPPER \
     $CXX_COMPILER \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \
@@ -254,9 +259,9 @@ _CPP_ARGS_NEW=\
 
 _C_ARGS_NEW=\
     $CLANG_TIDY_ARGS \
+    $_C_CPP_WRAPPER \
     $YNDEXER_ARGS \
     $RETRY_ARGS \
-    $_C_CPP_WRAPPER \
     $C_COMPILER \
     $C_FLAGS_PLATFORM \
     $GCC_COMPILE_FLAGS \

build/scripts/wrapcc.py

@@ -1,14 +1,27 @@
+import argparse
 import subprocess
-import sys
+import sys, os
 
 
-def fix(path: str):
+WRAPCC_ARGS_END='--wrapcc-end'
+
+def fix(source_file: str, source_root: str):
     flags = []
     return flags
 
+def parse_args():
+    delimer = -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."
+
+    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
+
 if __name__ == '__main__':
-    path = sys.argv[1]
-    args = sys.argv[2:]
-    cmd = args + fix(path)
-    rc = subprocess.call(cmd, shell=False, stderr=sys.stderr, stdout=sys.stdout)
-    sys.exit(rc)
+    args, cc_cmd = parse_args()
+    cmd = cc_cmd + fix(args.source_file, args.source_root)
+    os.execv(cmd[0], cmd)