Skip to content

Commit abec413

Browse files
committed
[libcxx] Enable '-fdelayed-template-parsing' for clang-cl libcxx tests
This patch enables '-fdelayed-template-parsing' in clang-cl based libcxx tests. This flag was disabled by default in PR#69431, which causes this test to fail.
1 parent 3324776 commit abec413

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

libcxx/test/configs/llvm-libc++-shared-clangcl.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
55

66
config.substitutions.append(('%{flags}', '--driver-mode=g++'))
77
config.substitutions.append(('%{compile_flags}',
8-
'-fms-runtime-lib=' + config.fms_runtime_lib + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + config.dbg_include
8+
'-fms-runtime-lib=' + config.fms_runtime_lib + ' -fdelayed-template-parsing' + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + config.dbg_include
99
))
1010
config.substitutions.append(('%{link_flags}',
1111
'-nostdlib -L %{lib} -lc++ -l' + config.cxx_lib

libcxx/test/configs/llvm-libc++-static-clangcl.cfg.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
lit_config.load_config(config, '@CMAKE_CURRENT_BINARY_DIR@/cmake-bridge.cfg')
55

66
config.substitutions.append(('%{flags}', '--driver-mode=g++'))
7+
# clang-cl by default disabled '-fdelayed-template-parsing'. Explicitly enable
8+
# it here for tests.
79
config.substitutions.append(('%{compile_flags}',
8-
'-fms-runtime-lib=' + config.fms_runtime_lib + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + config.dbg_include
10+
'-fms-runtime-lib=' + config.fms_runtime_lib + ' -fdelayed-template-parsing' + ' -nostdinc++ -I %{include} -I %{target-include} -I %{libcxx}/test/support -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_STDIO_ISO_WIDE_SPECIFIERS -DNOMINMAX' + config.dbg_include
911
))
1012
config.substitutions.append(('%{link_flags}',
1113
'-nostdlib -L %{lib} -llibc++ -l' + config.cxx_lib

0 commit comments

Comments
 (0)