Avoid unecessary changes to libc++ cmake

Created using spr 1.3.4

Author: ilovepi

clang/cmake/caches/Fuchsia-stage2.cmake

@@ -192,6 +192,10 @@ foreach(target aarch64-unknown-linux-gnu;armv7-unknown-linux-gnueabihf;i386-unkn
     set(RUNTIMES_${target}_LLVM_TOOLS_DIR "${CMAKE_BINARY_DIR}/bin" CACHE BOOL "")
     set(RUNTIMES_${target}_LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
 
+    # Enable FatLTO for Linux and baremetal runtimes
+    set(RUNTIMES_${target}_LLVM_ENABLE_LTO ON CACHE BOOL "")
+    set(RUNTIMES_${target}_LLVM_ENABLE_FATLTO ON CACHE BOOL "")
+
     # Use .build-id link.
     list(APPEND RUNTIME_BUILD_ID_LINK "${target}")
   endif()
@@ -274,6 +278,10 @@ if(FUCHSIA_SDK)
     set(RUNTIMES_${target}+asan+noexcept_LIBCXXABI_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
     set(RUNTIMES_${target}+asan+noexcept_LIBCXX_ENABLE_EXCEPTIONS OFF CACHE BOOL "")
 
+    # Enable FatLTO for Fuchsia runtimes
+    set(RUNTIMES_${target}_LLVM_ENABLE_LTO ON CACHE BOOL "")
+    set(RUNTIMES_${target}_LLVM_ENABLE_FATLTO ON CACHE BOOL "")
+
     # Use .build-id link.
     list(APPEND RUNTIME_BUILD_ID_LINK "${target}")
   endforeach()

libcxx/CMakeLists.txt

@@ -102,10 +102,6 @@ option(LIBCXX_ENABLE_WIDE_CHARACTERS
    support the C functionality for wide characters. When wide characters are
    not supported, several parts of the library will be disabled, notably the
    wide character specializations of std::basic_string." ON)
- option(LIBCXX_ENABLE_FATLTO
-   "Whether to compile libc++ with FatLTO enabled." ON)
- option(LIBCXX_ENABLE_LTO
-   "Whether to compile libc++ with LTO enabled." ON)
 
 # To use time zone support in libc++ the platform needs to have the IANA
 # database installed. Libc++ will fail to build if this is enabled on a

libcxx/src/CMakeLists.txt

@@ -169,16 +169,6 @@ if (APPLE AND LLVM_USE_SANITIZER)
   endif()
 endif()
 
-
-if(LIBCXX_ENABLE_LTO)
-  list(APPEND LIBCXX_COMPILE_FLAGS "-flto")
-  list(APPEND LIBCXX_LINK_FLAGS "-flto")
-endif()
-if(LIBCXX_ENABLE_FATLTO)
-  list(APPEND LIBCXX_COMPILE_FLAGS "-ffat-lto-objects")
-  list(APPEND LIBCXX_LINK_FLAGS "-ffat-lto-objects")
-endif()
-
 split_list(LIBCXX_COMPILE_FLAGS)
 split_list(LIBCXX_LINK_FLAGS)
 

libcxxabi/src/CMakeLists.txt

@@ -143,15 +143,6 @@ if ( APPLE )
   endif()
 endif()
 
-if(LIBCXX_ENABLE_LTO)
-  list(APPEND LIBCXXABI_COMPILE_FLAGS "-flto")
-  list(APPEND LIBCXXABI_LINK_FLAGS "-flto")
-endif()
-if(LIBCXX_ENABLE_FATLTO)
-  list(APPEND LIBCXXABI_COMPILE_FLAGS "-ffat-lto-objects")
-  list(APPEND LIBCXXABI_LINK_FLAGS "-ffat-lto-objects")
-endif()
-
 split_list(LIBCXXABI_COMPILE_FLAGS)
 split_list(LIBCXXABI_LINK_FLAGS)