Skip to content

Commit f91f41d

Browse files
ldionnegithub-actions[bot]
authored andcommitted
Automerge: [libc++] Fix check for _LIBCPP_HAS_NO_WIDE_CHARACTERS in features.py (#131675)
The patch that added the new locale Lit features was created before we switched to a 0-1 macro for _LIBCPP_HAS_WIDE_CHARACTERS, leading to that patch referring to the obsolete _LIBCPP_HAS_NO_WIDE_CHARACTERS macro that is never defined nowadays. (cherry picked from commit 297f6d9)
2 parents 658fb1d + b8e10ca commit f91f41d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

libcxx/utils/libcxx/test/features.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@ def _mingwSupportsModules(cfg):
440440
cfg, locale, alts, provide_locale_conversions[locale]
441441
)
442442
if locale in provide_locale_conversions
443-
and "_LIBCPP_HAS_NO_WIDE_CHARACTERS" not in compilerMacros(cfg)
443+
and ("_LIBCPP_HAS_WIDE_CHARACTERS" not in compilerMacros(cfg) or
444+
compilerMacros(cfg)["_LIBCPP_HAS_WIDE_CHARACTERS"] == "1")
444445
else [],
445446
),
446447
)

0 commit comments

Comments
 (0)