From 5482228e5cb645dbcf1f3a8b2e8bf48b191d49b4 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 13 Apr 2021 09:06:11 -0400 Subject: [PATCH] [gn build] fix bug in fb0b19c3de3b Since __config is no longer in the concatenated generated __config_site, it now needs to be copied. (Also fix a comment typo while here.) --- llvm/utils/gn/secondary/libcxx/include/BUILD.gn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn index 0c3b1128b0c4..02896bd7d795 100644 --- a/llvm/utils/gn/secondary/libcxx/include/BUILD.gn +++ b/llvm/utils/gn/secondary/libcxx/include/BUILD.gn @@ -6,7 +6,7 @@ libcxx_generated_include_dir = "$root_build_dir/include/c++/v1" # This is a bit weird. For now, we assume that __config_site is identical # in all toolchains, and only copy it (and all other libcxx headers) # to 'include' in the root build dir, so that it's the same for all toolchains. -# Maybe we wnt to make this per-toolchain eventually (and then use root_out_dir +# Maybe we want to make this per-toolchain eventually (and then use root_out_dir # in libcxx_generated_include_dir) -- e.g. for cross-builds that for example # use for-linux-configured libc++ for the host build but for-windows-configured # libc++ for the target build. @@ -64,6 +64,7 @@ if (current_toolchain == default_toolchain) { "__bits", "__bsd_locale_defaults.h", "__bsd_locale_fallbacks.h", + "__config", "__debug", "__errc", "__functional_03",