[compiler-rt] 80aa41d - Pass through even more LIBCXX_* variables to libfuzzer's custom lib++

[Pirama Arumuga Nainar via llvm-commits]

Author: Colin Cross
Date: 2022-06-15T19:05:29-07:00
New Revision: 80aa41d9df3dbe4ee673b3b0a8b41854b69820c5

URL: https://github.com/llvm/llvm-project/commit/80aa41d9df3dbe4ee673b3b0a8b41854b69820c5
DIFF: https://github.com/llvm/llvm-project/commit/80aa41d9df3dbe4ee673b3b0a8b41854b69820c5.diff

LOG: Pass through even more LIBCXX_* variables to libfuzzer's custom lib++

Similar to D120946, pass LIBCXX_HAS_GCC_S_LIB and LIBCXX_USE_COMPILER_RT
through to the custom lib++ builds so that libfuzzer doesn't end up with
a .deplibs section that links against those libraries when the
variables are set to false.

Reviewed By: phosek

Differential Revision: https://reviews.llvm.org/D127912

Added: 
    

Modified: 
    compiler-rt/cmake/Modules/AddCompilerRT.cmake

Removed: 
    


################################################################################
diff  --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
index 280a39311491d..502200654f042 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -646,8 +646,10 @@ macro(add_custom_libcxx name prefix)
     CMAKE_READELF
     CMAKE_SYSROOT
     LIBCXX_HAS_MUSL_LIBC
+    LIBCXX_HAS_GCC_S_LIB
     LIBCXX_HAS_PTHREAD_LIB
     LIBCXX_HAS_RT_LIB
+    LIBCXX_USE_COMPILER_RT
     LIBCXXABI_HAS_PTHREAD_LIB
     PYTHON_EXECUTABLE
     Python3_EXECUTABLE