[libcxx-commits] [libcxx] 6d66ac5 - [libcxx][CMake] Do not hard-code the ABI for the GPU build

[Joseph Huber via libcxx-commits]

Author: Joseph Huber
Date: 2024-09-20T13:52:08-05:00
New Revision: 6d66ac51a49af7ee46f1ccac45d312352d8b942e

URL: https://github.com/llvm/llvm-project/commit/6d66ac51a49af7ee46f1ccac45d312352d8b942e
DIFF: https://github.com/llvm/llvm-project/commit/6d66ac51a49af7ee46f1ccac45d312352d8b942e.diff

LOG: [libcxx][CMake] Do not hard-code the ABI for the GPU build

Summary:
We specify the ABI to experimental, but we should leave this up to the
user. Primarily this is because we want the ABI to be compatible with
the user's CPU build, so the default should be used.

Added: 
    

Modified: 
    libcxx/cmake/caches/AMDGPU.cmake
    libcxx/cmake/caches/NVPTX.cmake

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/caches/AMDGPU.cmake b/libcxx/cmake/caches/AMDGPU.cmake
index 7443470b2e8a8e..c7d6afc854a54c 100644
--- a/libcxx/cmake/caches/AMDGPU.cmake
+++ b/libcxx/cmake/caches/AMDGPU.cmake
@@ -1,5 +1,4 @@
 # Configuration options for libcxx.
-set(LIBCXX_ABI_VERSION 2 CACHE STRING "")
 set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
 set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
 set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")

diff  --git a/libcxx/cmake/caches/NVPTX.cmake b/libcxx/cmake/caches/NVPTX.cmake
index 3685ddcbb66624..231b457d3017e8 100644
--- a/libcxx/cmake/caches/NVPTX.cmake
+++ b/libcxx/cmake/caches/NVPTX.cmake
@@ -1,5 +1,4 @@
 # Configuration options for libcxx.
-set(LIBCXX_ABI_VERSION 2 CACHE STRING "")
 set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "")
 set(LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
 set(LIBCXX_ENABLE_FILESYSTEM OFF CACHE BOOL "")