From 7d1538cd3db3e228459e483ce9cdeb7fa4ae5e00 Mon Sep 17 00:00:00 2001 From: Sterling-Augustine Date: Mon, 27 Oct 2025 14:39:46 -0700 Subject: Move LIBC_CONF_STRING_UNSAFE_WIDE_READ to top-level libc-configuration (#165046) This options sets a compile option when building sources inside the string directory, and this option affects string_utils.h. But string_utils.h is #included from more places than just the string directory (such as from __support/CPP/string.h), leading to both narrow-reads in those cases, but more seriously, ODR violations when the two different string_length implementations are included int he same program. Having this option at the top level avoids this problem. --- libc/src/string/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'libc/src/string') diff --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt index 83c956429be2..a640e1d2cc77 100644 --- a/libc/src/string/CMakeLists.txt +++ b/libc/src/string/CMakeLists.txt @@ -1,15 +1,5 @@ add_subdirectory(memory_utils) -if(LIBC_CONF_STRING_UNSAFE_WIDE_READ) - list(APPEND string_config_options "-DLIBC_COPT_STRING_UNSAFE_WIDE_READ") -endif() -if(LIBC_CONF_MEMSET_X86_USE_SOFTWARE_PREFETCHING) - list(APPEND string_config_options "-DLIBC_COPT_MEMSET_X86_USE_SOFTWARE_PREFETCHING") -endif() -if(string_config_options) - list(PREPEND string_config_options "COMPILE_OPTIONS") -endif() - add_header_library( string_utils HDRS @@ -24,7 +14,6 @@ add_header_library( libc.src.__support.common libc.src.__support.macros.attributes libc.src.string.memory_utils.inline_memcpy - ${string_config_options} ) add_header_library( -- cgit v1.2.3