From 6d66ac51a49af7ee46f1ccac45d312352d8b942e Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Fri, 20 Sep 2024 13:51:17 -0500 Subject: [PATCH] [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. --- libcxx/cmake/caches/AMDGPU.cmake | 1 - libcxx/cmake/caches/NVPTX.cmake | 1 - 2 files changed, 2 deletions(-) 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 "")