[compiler-rt] 1ad920f - [compiler-rt] Pass CMAKE_TOOLCHAIN_FILE through to custom libc++ build

Shoaib Meenai via llvm-commits llvm-commits at lists.llvm.org
Mon Nov 6 11:28:16 PST 2023


Author: Shoaib Meenai
Date: 2023-11-06T11:27:47-08:00
New Revision: 1ad920f05efdbb80e449f6ec00e79a3677acc922

URL: https://github.com/llvm/llvm-project/commit/1ad920f05efdbb80e449f6ec00e79a3677acc922
DIFF: https://github.com/llvm/llvm-project/commit/1ad920f05efdbb80e449f6ec00e79a3677acc922.diff

LOG: [compiler-rt] Pass CMAKE_TOOLCHAIN_FILE through to custom libc++ build

This can be used to configure runtimes builds (instead of setting flags
individually), and we need to pass it down to the custom libc++ build
for it to work correctly.

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 9c9d256a58b61be..4d9b68a3cc25bf1 100644
--- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake
+++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake
@@ -643,6 +643,7 @@ macro(add_custom_libcxx name prefix)
     CMAKE_STRIP
     CMAKE_READELF
     CMAKE_SYSROOT
+    CMAKE_TOOLCHAIN_FILE
     LIBCXX_HAS_MUSL_LIBC
     LIBCXX_HAS_GCC_S_LIB
     LIBCXX_HAS_PTHREAD_LIB


        


More information about the llvm-commits mailing list