Skip to content

Commit ee8e0f3

Browse files
authored
Fix order of include flags for the target & regular include paths. (#93547)
The target include directory should always come first, since the regular includes are dependent on it
1 parent 867c9f6 commit ee8e0f3

6 files changed

+6
-6
lines changed

libcxx/test/configs/llvm-libc++-android-ndk.cfg.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ config.substitutions.append(('%{flags}',
1616
'--sysroot @CMAKE_SYSROOT@' if '@CMAKE_SYSROOT@' else ''
1717
))
1818

19-
compile_flags = '-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support'
19+
compile_flags = '-nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/test/support'
2020
if re.match(r'i686-linux-android(21|22|23)$', config.target_triple):
2121
# 32-bit x86 Android has a bug where the stack is sometimes misaligned.
2222
# The problem appears limited to versions before Android N (API 24) and only

libcxx/test/configs/llvm-libc++-mingw.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}', ''))
77
config.substitutions.append(('%{compile_flags}',
8-
'-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support'
8+
'-nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/test/support'
99
))
1010
config.substitutions.append(('%{link_flags}',
1111
'-nostdlib++ -L %{lib-dir} -lc++'

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-dir} -I %{target-include-dir} -I %{libcxx-dir}/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 + ' -nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/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-dir} -lc++ -l' + config.cxx_lib

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

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

77
config.substitutions.append(('%{flags}', '-pthread'))
88
config.substitutions.append(('%{compile_flags}',
9-
'-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support'
9+
'-nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/test/support'
1010
))
1111
config.substitutions.append(('%{link_flags}',
1212
'-nostdlib++ -L %{lib-dir} -Wl,-rpath,%{lib-dir} -lc++ -lm'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ config.substitutions.append(('%{flags}',
77
'-pthread' + (' -isysroot {}'.format('@CMAKE_OSX_SYSROOT@') if '@CMAKE_OSX_SYSROOT@' else '')
88
))
99
config.substitutions.append(('%{compile_flags}',
10-
'-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support'
10+
'-nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/test/support'
1111
))
1212
config.substitutions.append(('%{link_flags}',
1313
'-nostdlib++ -L %{lib-dir} -Wl,-rpath,%{lib-dir} -lc++'

libcxx/test/configs/llvm-libc++-static-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-dir} -I %{target-include-dir} -I %{libcxx-dir}/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 + ' -nostdinc++ -I %{target-include-dir} -I %{include-dir} -I %{libcxx-dir}/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-dir} -llibc++ -l' + config.cxx_lib

0 commit comments

Comments
 (0)