Merge pull request #3133 from gottesmm/use_llvmconfigcmake_instead_of_llvmconfig_for_library_dir

[llvm-config-removal] Instead of maintaining our own LLVM_LIBRARY_DIR…

Author: gottesmm

cmake/modules/SwiftSharedCMakeConfig.cmake

@@ -111,13 +111,12 @@ endfunction()
 macro(swift_common_standalone_build_config product is_cross_compiling)
   option(LLVM_ENABLE_WARNINGS "Enable compiler warnings." ON)
 
+  precondition_translate_flag(${product}_PATH_TO_LLVM_SOURCE PATH_TO_LLVM_SOURCE)
+  precondition_translate_flag(${product}_PATH_TO_LLVM_BUILD PATH_TO_LLVM_BUILD)
+
   if(${is_cross_compiling})
     # Can't run llvm-config from the cross-compiled LLVM.
     set(LLVM_TOOLS_BINARY_DIR "" CACHE PATH "Path to llvm/bin")
-    set(LLVM_LIBRARY_DIR "" CACHE PATH "Path to llvm/lib")
-    set(LLVM_MAIN_INCLUDE_DIR "" CACHE PATH "Path to llvm/include")
-    set(LLVM_BINARY_DIR "" CACHE PATH "Path to LLVM build tree")
-    set(LLVM_MAIN_SRC_DIR "" CACHE PATH "Path to LLVM source tree")
   else()
     # Rely on llvm-config.
     _swift_llvm_config_info(
@@ -135,10 +134,6 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
     mark_as_advanced(LLVM_ENABLE_ASSERTIONS)
 
     set(LLVM_TOOLS_BINARY_DIR "${llvm_config_tools_binary_dir}" CACHE PATH "Path to llvm/bin")
-    set(LLVM_LIBRARY_DIR "${llvm_config_library_dir}" CACHE PATH "Path to llvm/lib")
-    set(LLVM_MAIN_INCLUDE_DIR "${llvm_config_include_dir}" CACHE PATH "Path to llvm/include")
-    set(LLVM_BINARY_DIR "${llvm_config_obj_root}" CACHE PATH "Path to LLVM build tree")
-    set(LLVM_MAIN_SRC_DIR "${llvm_config_src_dir}" CACHE PATH "Path to LLVM source tree")
 
     set(${product}_NATIVE_LLVM_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
     set(${product}_NATIVE_CLANG_TOOLS_PATH "${LLVM_TOOLS_BINARY_DIR}")
@@ -148,8 +143,8 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
     NO_DEFAULT_PATH)
 
   set(LLVM_CMAKE_PATHS
-      "${LLVM_BINARY_DIR}/share/llvm/cmake"
-      "${LLVM_BINARY_DIR}/lib/cmake/llvm")
+      "${PATH_TO_LLVM_BUILD}/share/llvm/cmake"
+      "${PATH_TO_LLVM_BUILD}/lib/cmake/llvm")
 
   set(LLVMCONFIG_FILE)
   foreach(CMAKE_PATH ${LLVM_CMAKE_PATHS})
@@ -172,16 +167,15 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
   set(LLVM_TOOLS_BINARY_DIR "${LLVM_TOOLS_BINARY_DIR_saved}")
   set(LLVM_ENABLE_ASSERTIONS "${LLVM_ENABLE_ASSERTIONS_saved}")
 
-  # Clang
-  set(${product}_PATH_TO_LLVM_SOURCE "${LLVM_MAIN_SRC_DIR}")
-  set(${product}_PATH_TO_LLVM_BUILD "${LLVM_BINARY_DIR}")
-
-  set(PATH_TO_LLVM_SOURCE "${${product}_PATH_TO_LLVM_SOURCE}")
-  set(PATH_TO_LLVM_BUILD "${${product}_PATH_TO_LLVM_BUILD}")
+  precondition_translate_flag(LLVM_BUILD_LIBRARY_DIR LLVM_LIBRARY_DIR)
+  precondition_translate_flag(LLVM_BUILD_MAIN_INCLUDE_DIR LLVM_MAIN_INCLUDE_DIR)
+  precondition_translate_flag(LLVM_BUILD_BINARY_DIR LLVM_BINARY_DIR)
+  precondition_translate_flag(LLVM_BUILD_MAIN_SRC_DIR LLVM_MAIN_SRC_DIR)
 
-  set(${product}_PATH_TO_CLANG_SOURCE "${${product}_PATH_TO_LLVM_SOURCE}/tools/clang"
+  # Clang
+  set(${product}_PATH_TO_CLANG_SOURCE "${PATH_TO_LLVM_SOURCE}/tools/clang"
       CACHE PATH "Path to Clang source code.")
-  set(${product}_PATH_TO_CLANG_BUILD "${${product}_PATH_TO_LLVM_BUILD}" CACHE PATH
+  set(${product}_PATH_TO_CLANG_BUILD "${PATH_TO_LLVM_BUILD}" CACHE PATH
     "Path to the directory where Clang was built or installed.")
 
   set(${product}_PATH_TO_CMARK_SOURCE "${${product}_PATH_TO_CMARK_SOURCE}"
@@ -218,11 +212,6 @@ macro(swift_common_standalone_build_config product is_cross_compiling)
 
   list(APPEND CMAKE_MODULE_PATH "${${product}_PATH_TO_LLVM_BUILD}/share/llvm/cmake")
 
-  get_filename_component(PATH_TO_LLVM_BUILD "${${product}_PATH_TO_LLVM_BUILD}"
-    ABSOLUTE)
-  get_filename_component(PATH_TO_CLANG_BUILD "${${product}_PATH_TO_CLANG_BUILD}"
-    ABSOLUTE)
-
   set(LLVM_ABI_BREAKING_CHECKS "WITH_ASSERTS")
 
   include(AddLLVM)

cmake/modules/SwiftTranslateFlag.cmake

@@ -1,3 +1,5 @@
+include(SwiftUtils)
+
 # Translate a yes/no variable to the presence of a given string in a
 # variable.
 #
@@ -20,3 +22,8 @@ macro(translate_flags prefix options)
   endforeach()
 endmacro()
 
+# Set ${outvar} to ${${invar}}, asserting if ${invar} is not set.
+function(precondition_translate_flag invar outvar)
+  precondition(${invar})
+  set(${outvar} "${${invar}}" PARENT_SCOPE)
+endfunction()

cmake/modules/SwiftUtils.cmake

@@ -0,0 +1,5 @@
+function(precondition var)
+  if (NOT ${var})
+    message(FATAL_ERROR "Error! Variable ${var} is false or not set!")
+  endif()
+endfunction()

utils/build-script-impl

@@ -1836,10 +1836,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     cmake_options=(
                         "${cmake_options[@]}"
                         -DLLVM_TOOLS_BINARY_DIR:PATH=$(build_directory ${host} llvm)/bin
-                        -DLLVM_LIBRARY_DIR:PATH=$(build_directory ${host} llvm)/lib
-                        -DLLVM_MAIN_INCLUDE_DIR:PATH=$(build_directory ${host} llvm)/include
-                        -DLLVM_BINARY_DIR:PATH=$(build_directory ${host} llvm)
-                        -DLLVM_MAIN_SRC_DIR:PATH="${LLVM_SOURCE_DIR}"
                     )
                 else
                     build_perf_testsuite_this_time=$(true_false "$(not ${SKIP_BUILD_BENCHMARKS})")
@@ -1862,10 +1858,6 @@ for host in "${ALL_HOSTS[@]}"; do
                     cmake_options=(
                         "${cmake_options[@]}"
                         -DLLVM_TOOLS_BINARY_DIR:PATH=/tmp/dummy
-                        -DLLVM_LIBRARY_DIR:PATH="${build_dir}"
-                        -DLLVM_MAIN_INCLUDE_DIR:PATH=/tmp/dummy
-                        -DLLVM_BINARY_DIR:PATH=$(build_directory ${host} llvm)
-                        -DLLVM_MAIN_SRC_DIR:PATH="${LLVM_SOURCE_DIR}"
                     )
                 fi