[llvm] Add install-distribution-stripped

[smeenai]

Summary

This is identical to the install-distribution target, except that it
strips the installed binaries.

[beanz]

CMakeLists.txt

352

I don't think there is any reason for this to be gated on an option. Once your other patches adding stripped targets have fully gone through you should be able to always add this.

[smeenai]

CMakeLists.txt

352

Like I said in the description, I added the install-*-distribution targets for pretty much everything I could think of, but it wouldn't surprise me at all if I missed something, and I'd rather not break people's cmake configures because of an oversight on my part.

One alternative would be not have this option, and instead unconditionally try to create the install-distribution-stripped target, but give a warning (not an error) if any of the individual requisite install-*-stripped targets don't exist. It might be slightly noisy, but the warnings should be pretty easy to address, and eventually they can be upgraded to an error. I'd also still announce the change on llvm-dev, so people understand why they're suddenly getting these warnings during their configure. What do you think?

[beanz]

CMakeLists.txt

352

I think that the LLVM_DISTRIBUTION_COMPONENTS option is used infrequently enough that it probably is fine to have as an error by default and not gated by an option.

The only place I think you're missing install-*-stripped targets is the llvm/runtimes directory's extra targets. I've added @phosek who has done a lot of the work in that area. I may have time to take a stab at it this afternoon.

[smeenai]

CMakeLists.txt

352

libc++'s is awaiting review (https://reviews.llvm.org/D40680).

I'd missed the runtimes one. I can throw up a patch for that if you haven't started working on that already.

I'm happy to make this unconditional then.

[smeenai]

Make unconditional

[phosek]

I'd be happy to review the runtimes part. Also, how is this supposed to interact with LLVM_EXTERNALIZE_DEBUGINFO?

[smeenai]

In D40689#942918, @phosek wrote:

Also, how is this supposed to interact with LLVM_EXTERNALIZE_DEBUGINFO?

The two are pretty orthogonal IMO. LLVM_EXTERNALIZE_DEBUGINFO controls the stripping of binaries in the build tree; this controls the stripping of binaries in the install tree. Since the binaries in the build tree are what get installed, LLVM_EXTERNALIZE_DEBUGINFO would also result in the installed binaries being stripped, but kinda indirectly. LLVM_EXTERNALIZE_DEBUGINFO also doesn't strip global symbols (it performs strip -gx) whereas this does, and the difference can be substantial in some cases (e.g. on my clang build strip -s saves 3 MB on top of strip -gx).

[smeenai]

D40927 should be the last remaining piece needed here.

CMakeLists.txt

 
 option(LLVM_ENABLE_FFI "Use libffi to call external functions from the interpreter" OFF)
 set(FFI_LIBRARY_DIR "" CACHE PATH "Additional directory, where CMake should search for libffi.so")
 set(FFI_INCLUDE_DIR "" CACHE PATH "Additional directory, where CMake should search for ffi.h or ffi/ffi.h")
 
 set(LLVM_TARGET_ARCH "host"
   CACHE STRING "Set target to use for LLVM JIT or use \"host\" for automatic detection.")
 
+option(LLVM_ENABLE_INSTALL_DISTRIBUTION_STRIPPED
+       "Enable the install-distribution-stripped target, to install a stripped distribution."
+       OFF)
+
 option(LLVM_ENABLE_TERMINFO "Use terminfo database if available." ON)
 
 set(LLVM_ENABLE_LIBXML2 "ON" CACHE STRING "Use libxml2 if available. Can be ON, OFF, or FORCE_ON")
 
 option(LLVM_ENABLE_LIBEDIT "Use libedit if available." ON)
 
 option(LLVM_ENABLE_THREADS "Use threads if available." ON)
 

 # after all targets are created.
 if(LLVM_DISTRIBUTION_COMPONENTS)
   if(CMAKE_CONFIGURATION_TYPES)
     message(FATAL_ERROR "LLVM_DISTRIBUTION_COMPONENTS cannot be specified with multi-configuration generators (i.e. Xcode or Visual Studio)")
   endif()
 
   add_custom_target(distribution)
   add_custom_target(install-distribution)
+  if(LLVM_ENABLE_INSTALL_DISTRIBUTION_STRIPPED)
+    add_custom_target(install-distribution-stripped)
+  endif()
   foreach(target ${LLVM_DISTRIBUTION_COMPONENTS})
     if(TARGET ${target})
       add_dependencies(distribution ${target})
     else()
       message(SEND_ERROR "Specified distribution component '${target}' doesn't have a target")
     endif()
 
     if(TARGET install-${target})
       add_dependencies(install-distribution install-${target})
     else()
       message(SEND_ERROR "Specified distribution component '${target}' doesn't have an install target")
     endif()
+
+    if(LLVM_ENABLE_INSTALL_DISTRIBUTION_STRIPPED)
+      if(TARGET install-${target}-stripped)
+        add_dependencies(install-distribution-stripped install-${target}-stripped)
+      else()
+        message(SEND_ERROR "Specified distribution component '${target}' doesn't have an install-stripped target."
+                           " Its installation target creation should be changed to use add_llvm_install_targets,"
+                           " or you should manually create the 'install-${target}-stripped' target.")
+      endif()
+    endif()
   endforeach()
 endif()
 
 # This allows us to deploy the Universal CRT DLLs by passing -DCMAKE_INSTALL_UCRT_LIBRARIES=ON to CMake
 if (MSVC)
   include(InstallRequiredSystemLibraries)
 endif()