Skip to content

Commit 1121815

Browse files
Standardize C++20 flag across different platforms in build script
1 parent 1e580a7 commit 1121815

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/mk_util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2500,7 +2500,7 @@ def mk_config():
25002500
config = open(os.path.join(BUILD_DIR, 'config.mk'), 'w')
25012501
global CXX, CC, GMP, GUARD_CF, STATIC_BIN, GIT_HASH, CPPFLAGS, CXXFLAGS, LDFLAGS, EXAMP_DEBUG_FLAG, FPMATH_FLAGS, LOG_SYNC, SINGLE_THREADED, IS_ARCH_ARM64
25022502
if IS_WINDOWS:
2503-
CXXFLAGS = '/nologo /Zi /D WIN32 /D _WINDOWS /EHsc /GS /Gd /std:C++20'
2503+
CXXFLAGS = '/nologo /Zi /D WIN32 /D _WINDOWS /EHsc /GS /Gd /std:c++20'
25042504
config.write(
25052505
'CC=cl\n'
25062506
'CXX=cl\n'
@@ -2616,7 +2616,7 @@ def mk_config():
26162616
CPPFLAGS = '%s -D_MP_INTERNAL' % CPPFLAGS
26172617
if GIT_HASH:
26182618
CPPFLAGS = '%s -DZ3GITHASH=%s' % (CPPFLAGS, GIT_HASH)
2619-
CXXFLAGS = '%s -std=C++20' % CXXFLAGS
2619+
CXXFLAGS = '%s -std=c++20' % CXXFLAGS
26202620
CXXFLAGS = '%s -fvisibility=hidden -fvisibility-inlines-hidden -c' % CXXFLAGS
26212621
FPMATH = test_fpmath(CXX)
26222622
CXXFLAGS = '%s %s' % (CXXFLAGS, FPMATH_FLAGS)
@@ -2699,7 +2699,7 @@ def mk_config():
26992699
config.write('CC=%s\n' % CC)
27002700
config.write('CXX=%s\n' % CXX)
27012701
config.write('CXXFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS))
2702-
config.write('CFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS.replace('-std=C++20', '')))
2702+
config.write('CFLAGS=%s %s\n' % (CPPFLAGS, CXXFLAGS.replace('-std=c++20', '')))
27032703
config.write('EXAMP_DEBUG_FLAG=%s\n' % EXAMP_DEBUG_FLAG)
27042704
config.write('CXX_OUT_FLAG=-o \n')
27052705
config.write('C_OUT_FLAG=-o \n')

0 commit comments

Comments
 (0)