[llvm-branch-commits] [libc] release/20.x: fix: removes invalid token from LLVM_VERSION_SUFFIX in LIBC namespace (#126193) (PR #126284)

via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Fri Feb 7 10:27:52 PST 2025


https://github.com/llvmbot created https://github.com/llvm/llvm-project/pull/126284

Backport 51759ffc4408e9eb5c2d40c9489ce3b98de233d5

Requested by: @jhuber6

>From 3a3a3230d171e11842a9940b6da0f72022b1c5b3 Mon Sep 17 00:00:00 2001
From: "s.vgys" <83276820+samvangysegem at users.noreply.github.com>
Date: Fri, 7 Feb 2025 18:45:38 +0100
Subject: [PATCH] fix: removes invalid token from LLVM_VERSION_SUFFIX in LIBC
 namespace (#126193)

Resolves #125831

(cherry picked from commit 51759ffc4408e9eb5c2d40c9489ce3b98de233d5)
---
 libc/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index c061e2a05ebd8f5..1c4c0cd5aa22ba7 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -51,7 +51,8 @@ set(LIBC_KERNEL_HEADERS "/usr/include" CACHE STRING "Path to Linux kernel header
 # Defining a global namespace to enclose all libc functions.
 set(default_namespace "__llvm_libc")
 if(LLVM_VERSION_MAJOR)
-  set(default_namespace "__llvm_libc_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}_${LLVM_VERSION_PATCH}_${LLVM_VERSION_SUFFIX}")
+  string(REPLACE "-" "" NS_LLVM_VERSION_SUFFIX ${LLVM_VERSION_SUFFIX})
+  set(default_namespace "__llvm_libc_${LLVM_VERSION_MAJOR}_${LLVM_VERSION_MINOR}_${LLVM_VERSION_PATCH}_${NS_LLVM_VERSION_SUFFIX}")
 endif()
 set(LIBC_NAMESPACE ${default_namespace}
   CACHE STRING "The namespace to use to enclose internal implementations. Must start with '__llvm_libc'."



More information about the llvm-branch-commits mailing list