[libcxxabi] Remove strict dependency on llvm-config.

[danalbert]

Summary

Depending on llvm-config allows for a few nice things (auto-detecting LLVM source tree, version numbers, etc), but it's makes bootstrapping a pain. Keep the llvm-config features around, but also fall back to being able to configure based on -DLLVM_MAIN_SRC_DIR=path/to/llvm.

[loladiro]

Seems to work fine for me, modulo having to set -std=c++11 manually in the CXXFLAGS, which is automatically set in libcxx and could be here too.

[loladiro]

One issue is that, if there is a llvm-config executable in the path, it tried to use that, which I want to prevent (this happened to me while trying to rebuild with different options - libcxxabi wasn't installed anymore, but llvm-config depending on it still was).

[loladiro]

Also, for some reason passing in CMAKE_SHARED_LINKER_FLAGS didn't work. Any idea why?

[loladiro]

Never mind, it just put it in a different place that I expected it to. Fixed by using LIBCXXABI_CXX_ABI_LIBRARIES instead.

[danalbert]

In D5016#5, @loladiro wrote:

One issue is that, if there is a llvm-config executable in the path, it tried to use that, which I want to prevent (this happened to me while trying to rebuild with different options - libcxxabi wasn't installed anymore, but llvm-config depending on it still was).

Well, if there's an invalid llvm-config on your system, you should probably remove llvm-config :) I think I can probably just reorder the if/elseif and get the behavior you want though, but that might cause issues with rerunning cmake on an already configured directory.

In D5016#4, @loladiro wrote:

Seems to work fine for me, modulo having to set -std=c++11 manually in the CXXFLAGS, which is automatically set in libcxx and could be here too.

Interesting. Outside the realm of this patch, but I'll fix that too.

[loladiro]

Well, if there's an invalid llvm-config on your system, you should probably remove llvm-config :) I think I can probably just reorder the if/elseif and get the behavior you want though, but that might cause issues with rerunning cmake on an already configured directory.

It's only invalid while rebuilding libcxxabi though, it'll work again just fine after ;)

Interesting. Outside the realm of this patch, but I'll fix that too.

Thanks!

[danalbert]

• Fix a few issues with the last commit.

[loladiro]

Can't test because the machine I was testing on is currently rebuilding it's file system. But from reading the commit LGTM.

[danalbert]

Keno, PTAL. I've fixed the following things in this revision:

• Allow the user to specify a specific LLVM tree even if llvm-config is on their system.
• Had accidentally removed LLVM_BINARY_DIR for llvm-config path, preventing it from finding the cmake files.
• Fixed behavior for re-running cmake in already configured directory.

I've verified that either path works (even under a re-run of cmake) and can correctly find the cmake files, build and run LIT.

If everything works for you, please approve and I'll commit it.

[danalbert]

In D5016#12, @loladiro wrote:

Can't test because the machine I was testing on is currently rebuilding it's file system. But from reading the commit LGTM.

I'm in no hurry. Just let me know when you get a chance. Thanks!

[loladiro]

It ran though fine the first time, but I tried reconfiguring and I got:

cd libcxxabi-build && \
        cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=/home/kfischer/julia-test/usr -DLLVM_PATH:PATH=/home/kfischer/julia-test/deps/llvm-svn -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/home/kfischer/julia-test/usr ../llvm-svn/projects/libcxxabi -DCMAKE_C_COMPILER="clang" -DCMAKE_CXX_COMPILER="clang++" -DLIBCXXABI_CXX_ABI_LIBRARIES="" -DCMAKE_CXX_FLAGS="-fno-stack-protector -cxxlib-nostd -static-intel -std=c++11"
-- Configuring done
You have changed variables that require your cache to be deleted.
Configure will be re-run and you may have to reset some variables.
The following variables have changed:
CMAKE_C_COMPILER= clang
CMAKE_CXX_COMPILER= clang++

-- The C compiler identification is 
-- The CXX compiler identification is
-- Check for working C compiler: /home/kfischer/clang/bin/clang
-- Check for working C compiler: /home/kfischer/clang/bin/clang -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Check for working CXX compiler: /home/kfischer/clang/bin/clang++
-- Check for working CXX compiler: /home/kfischer/clang/bin/clang++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
CMake Error at CMakeLists.txt:49 (message):
  llvm-config not found and LLVM_MAIN_SRC_DIR not defined
``
any ideas?

[danalbert]

I think you need to not specify -DCMAKE_C(XX)?_COMPILER on the second run.
Cmake doesn't let you change compiler after the first run. Even though
you're configuring it as the same compiler, it might just reject those
options on a rerun.

[loladiro]

That's unfortunate, but I guess nothing to do with this patch. LGTM.

[danalbert]

Submitted as r216482.

CMakeLists.txt

 #===============================================================================
 # Setup Project
 #===============================================================================
 
 cmake_minimum_required(VERSION 2.8.8)
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   project(libcxxabi)
 
   # Rely on llvm-config.
   set(CONFIG_OUTPUT)
   find_program(LLVM_CONFIG "llvm-config")
-  if(LLVM_CONFIG)
+  if(DEFINED LLVM_PATH)
+    set(LLVM_INCLUDE_DIR ${LLVM_INCLUDE_DIR} CACHE PATH "Path to llvm/include")
+    set(LLVM_PATH ${LLVM_PATH} CACHE PATH "Path to LLVM source tree")
+    set(LLVM_MAIN_SRC_DIR ${LLVM_PATH})
+    set(LLVM_CMAKE_PATH "${LLVM_PATH}/cmake/modules")
+  elseif(LLVM_CONFIG)
     message(STATUS "Found LLVM_CONFIG as ${LLVM_CONFIG}")
     set(CONFIG_COMMAND ${LLVM_CONFIG}
-      "--bindir"
       "--includedir"
-      "--libdir"
       "--prefix"
       "--src-root")
     execute_process(
       COMMAND ${CONFIG_COMMAND}
       RESULT_VARIABLE HAD_ERROR
       OUTPUT_VARIABLE CONFIG_OUTPUT
     )
     if(NOT HAD_ERROR)
       string(REGEX REPLACE
         "[ \t]*[\r\n]+[ \t]*" ";"
         CONFIG_OUTPUT ${CONFIG_OUTPUT})
     else()
       string(REPLACE ";" " " CONFIG_COMMAND_STR "${CONFIG_COMMAND}")
       message(STATUS "${CONFIG_COMMAND_STR}")
       message(FATAL_ERROR "llvm-config failed with status ${HAD_ERROR}")
     endif()
-  else()
-    message(FATAL_ERROR "llvm-config not found -- ${LLVM_CONFIG}")
-  endif()
 
-  list(GET CONFIG_OUTPUT 0 TOOLS_BINARY_DIR)
-  list(GET CONFIG_OUTPUT 1 INCLUDE_DIR)
-  list(GET CONFIG_OUTPUT 2 LIBRARY_DIR)
-  list(GET CONFIG_OUTPUT 3 LLVM_OBJ_ROOT)
-  list(GET CONFIG_OUTPUT 4 MAIN_SRC_DIR)
+    list(GET CONFIG_OUTPUT 0 INCLUDE_DIR)
+    list(GET CONFIG_OUTPUT 1 LLVM_OBJ_ROOT)
+    list(GET CONFIG_OUTPUT 2 MAIN_SRC_DIR)
 
-  set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin")
     set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include")
-  set(LLVM_LIBRARY_DIR ${LIBRARY_DIR} CACHE PATH "Path to llvm/lib")
     set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree")
     set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree")
-
     set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake")
-  set(LLVMCONFIG_FILE "${LLVM_CMAKE_PATH}/LLVMConfig.cmake")
-  if(EXISTS ${LLVMCONFIG_FILE})
+    set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py")
+  else()
+    message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined")
+  endif()
+
+  if(EXISTS ${LLVM_CMAKE_PATH})
     list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_PATH}")
-    include(${LLVMCONFIG_FILE})
     include("${LLVM_CMAKE_PATH}/AddLLVM.cmake")
     include("${LLVM_CMAKE_PATH}/HandleLLVMOptions.cmake")
   else()
-    message(FATAL_ERROR "Not found: ${LLVMCONFIG_FILE}")
+    message(FATAL_ERROR "Not found: ${LLVM_CMAKE_PATH}")
   endif()
 
   set(PACKAGE_NAME libcxxabi)
-  set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
+  set(PACKAGE_VERSION 3.6.0svn)
   set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
   set(PACKAGE_BUGREPORT "[e-mail]")
 
   if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
     set(LLVM_LIT ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
   else()
     # Seek installed Lit.
     find_program(LLVM_LIT "lit.py" ${LLVM_MAIN_SRC_DIR}/utils/lit