Revert commit rXXXXXX, Use lld-link for target-platform windows, fix arc native build

0bd1ab2bb753fb9458cc5f295e94e24cf1115055

2 files changed, 2 insertions, 22 deletions

diff --git a/build/conf/linkers/msvc_linker.conf b/build/conf/linkers/msvc_linker.conf
index f10acb71df..79886b3dc5 100644
--- a/build/conf/linkers/msvc_linker.conf
+++ b/build/conf/linkers/msvc_linker.conf
@@ -106,21 +106,6 @@ OBJADDE_LIB=
 OBJADDE_LIB_GLOBAL=
 
 LINK_EXE_FLAGS=$LINK_EXE_FLAGS_PER_TYPE
-LINK_EXE_VFS_FLAGS=
-when ($_UNDER_WINE_LINK != "yes") {
-    LINK_EXE_VFS_FLAGS=/vfsoverlay:${BINDIR}/vfsoverlay.yaml
-}
-LINK_EXE_FLAGS+=${LINK_EXE_VFS_FLAGS}
-
-GENERATE_COMMON_LIB_VFS_CMD=\
-    ${YMAKE_PYTHON3} ${input:"build/scripts/generate_win_vfs.py"} \
-    ${BINDIR} \
-    ${_FLAGS_COMMON_LIBPATHS}
-
-GENERATE_COMMON_LIB_VFS=
-when ($_UNDER_WINE_LINK != "yes") {
-    GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD}
-}
 
 LINK_IMPLIB=/IMPLIB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.lib}
 _LINK_EXTRA_OUTPUT=
@@ -131,7 +116,7 @@ LINK_EXTRA_OUTPUT=$_LINK_EXTRA_OUTPUT
 
 LIB_WRAPPER=${FIX_MSVC_OUTPUT} lib
 LINK_WRAPPER=${FIX_MSVC_OUTPUT} link
-when ($_UNDER_WINE_LINK == "yes") {
+when ($_UNDER_WINE_TOOLS == "yes") {
     LINK_WRAPPER=
 }
 when ($_UNDER_WINE_LIB == "yes") {
@@ -171,7 +156,6 @@ _MSVC_SRCS_GLOBALS=\
 --ya-start-command-file ${qe;rootrel;ext=.obj:SRCS_GLOBAL} --ya-end-command-file
 
 REAL_LINK_DYN_LIB_CMDLINE=\
-    ${GENERATE_COMMON_LIB_VFS} && \
     ${TOOLCHAIN_ENV} \
     ${cwd:ARCADIA_BUILD_ROOT} \
     ${LINK_WRAPPER} \
@@ -214,7 +198,6 @@ LINK_EXE_CMDLINE=\
     ${GENERATE_MF} && \
     ${_GENERATE_EXTRA_OBJS} && \
     $GENERATE_VCS_C_INFO_NODEP && \
-    ${GENERATE_COMMON_LIB_VFS} && \
     ${TOOLCHAIN_ENV} \
     ${cwd:ARCADIA_BUILD_ROOT} \
     ${LINK_WRAPPER} \
@@ -244,7 +227,6 @@ LINK_DYN_LIB=${GENERATE_MF} && $GENERATE_VCS_C_INFO_NODEP && $REAL_LINK_DYN_LIB
 LINK_EXEC_DYN_LIB_CMDLINE=\
     ${GENERATE_MF} && \
     $GENERATE_VCS_C_INFO_NODEP && \
-    ${GENERATE_COMMON_LIB_VFS} && \
     ${TOOLCHAIN_ENV} \
     ${cwd:ARCADIA_BUILD_ROOT} \
     ${LINK_WRAPPER} \
diff --git a/build/conf/toolchains/msvc_toolchain.conf b/build/conf/toolchains/msvc_toolchain.conf
index ce99c84089..94e0e444f0 100644
--- a/build/conf/toolchains/msvc_toolchain.conf
+++ b/build/conf/toolchains/msvc_toolchain.conf
@@ -10,10 +10,8 @@ _WINE_LINK_PREFIX=
 _WINE_LIB_PREFIX=
 _WINE_MASM_PREFIX=
 when ($_UNDER_WINE_TOOLS == "yes") {
-    _WINE_MASM_PREFIX=${_WINE_CMD} masm ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
-}
-when ($_UNDER_WINE_LINK == "yes") {
     _WINE_LINK_PREFIX=${_WINE_CMD} link ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
+    _WINE_MASM_PREFIX=${_WINE_CMD} masm ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}
 }
 when ($_UNDER_WINE_LIB == "yes") {
     _WINE_LIB_PREFIX=${_WINE_CMD} lib ${ARCADIA_ROOT} ${ARCADIA_BUILD_ROOT}