aboutsummaryrefslogtreecommitdiffstats
path: root/build/ymake_conf.py
diff options
context:
space:
mode:
authorStanislav Kirillov <staskirillov@gmail.com>2022-02-10 16:46:07 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:46:07 +0300
commit92fe2b1e7bc79f7b95adef61714fc003f6ea4a1c (patch)
tree817034f4ca57c9f841bb047ec94630c2e78a2b1d /build/ymake_conf.py
parent53c76da6d9f6cc5a17f6029df396f0e3bc1ff47d (diff)
downloadydb-92fe2b1e7bc79f7b95adef61714fc003f6ea4a1c.tar.gz
Restoring authorship annotation for Stanislav Kirillov <staskirillov@gmail.com>. Commit 1 of 2.
Diffstat (limited to 'build/ymake_conf.py')
-rwxr-xr-xbuild/ymake_conf.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 30219eb85e..1dbb194cd8 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -2224,10 +2224,10 @@ class MSVCToolchainOptions(ToolchainOptions):
sdk_dir = os.environ.get('WindowsSdkDir')
self.sdk_version = os.environ.get('WindowsSDKVersion').replace('\\', '')
vc_install_dir = os.environ.get('VCToolsInstallDir')
- # fix for cxx_std detection problem introduced in r7740071 when running in native VS toolkit commandline:
- # in that case ya make gets 'system_cxx' configuration name and cxx_std is obviously missing in that config
- # so default 'c++20' is substituted and we need to hotfix it here
- self.cxx_std = 'c++latest'
+ # fix for cxx_std detection problem introduced in r7740071 when running in native VS toolkit commandline:
+ # in that case ya make gets 'system_cxx' configuration name and cxx_std is obviously missing in that config
+ # so default 'c++20' is substituted and we need to hotfix it here
+ self.cxx_std = 'c++latest'
if any([x is None for x in (sdk_dir, self.sdk_version, vc_install_dir)]):
raise ConfigureError('No %WindowsSdkDir%, %WindowsSDKVersion% or %VCINSTALLDIR% present. Please, run vcvars64.bat to setup preferred environment.')
@@ -2739,13 +2739,13 @@ class MSVCLinker(MSVC, Linker):
emit('LINK_EXE_FLAGS', '$LINK_EXE_FLAGS_PER_TYPE')
- emit('LINK_IMPLIB_VALUE')
+ emit('LINK_IMPLIB_VALUE')
emit('LINK_IMPLIB', '/IMPLIB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.lib}')
if is_negative_str(preset('NO_DEBUGINFO', 'no')):
emit('LINK_EXTRA_OUTPUT', '/PDB:${output;noext;rootrel;pre=$MODULE_PREFIX:REALPRJNAME.pdb}')
else:
emit('LINK_EXTRA_OUTPUT')
-
+
if not self.tc.under_wine:
emit('LIB_WRAPPER', '${YMAKE_PYTHON}', '${input:"build/scripts/fix_msvc_output.py"}', 'lib')
emit('LINK_WRAPPER', '${YMAKE_PYTHON}', '${input:"build/scripts/fix_msvc_output.py"}', 'link')