diff options
author | Chris Bieneman <beanz@apple.com> | 2016-01-26 21:29:08 +0000 |
---|---|---|
committer | Chris Bieneman <beanz@apple.com> | 2016-01-26 21:29:08 +0000 |
commit | e49730d4baa8443ad56f59bd8066bf4c1e56ea72 (patch) | |
tree | 3b8c29f4c2b5812db6c63a6aa42f0f59cadaa105 /llvm/cmake/modules | |
parent | e7305cc4b3644e2e82684603f0b37a9ec1798e4c (diff) | |
download | bcm5719-llvm-e49730d4baa8443ad56f59bd8066bf4c1e56ea72.tar.gz bcm5719-llvm-e49730d4baa8443ad56f59bd8066bf4c1e56ea72.zip |
Remove autoconf support
Summary:
This patch is provided in preparation for removing autoconf on 1/26. The proposal to remove autoconf on 1/26 was discussed on the llvm-dev thread here: http://lists.llvm.org/pipermail/llvm-dev/2016-January/093875.html
"I felt a great disturbance in the [build system], as if millions of [makefiles] suddenly cried out in terror and were suddenly silenced. I fear something [amazing] has happened."
- Obi Wan Kenobi
Reviewers: chandlerc, grosbach, bob.wilson, tstellarAMD, echristo, whitequark
Subscribers: chfast, simoncook, emaste, jholewinski, tberghammer, jfb, danalbert, srhines, arsenm, dschuff, jyknight, dsanders, joker.eph, llvm-commits
Differential Revision: http://reviews.llvm.org/D16471
llvm-svn: 258861
Diffstat (limited to 'llvm/cmake/modules')
-rw-r--r-- | llvm/cmake/modules/GetHostTriple.cmake | 2 | ||||
-rw-r--r-- | llvm/cmake/modules/Makefile | 150 |
2 files changed, 1 insertions, 151 deletions
diff --git a/llvm/cmake/modules/GetHostTriple.cmake b/llvm/cmake/modules/GetHostTriple.cmake index 671a8ce7d7c..5de710c7ede 100644 --- a/llvm/cmake/modules/GetHostTriple.cmake +++ b/llvm/cmake/modules/GetHostTriple.cmake @@ -15,7 +15,7 @@ function( get_host_triple var ) set( value "i686-pc-mingw32" ) endif() else( MSVC ) - set(config_guess ${LLVM_MAIN_SRC_DIR}/autoconf/config.guess) + set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) execute_process(COMMAND sh ${config_guess} RESULT_VARIABLE TT_RV OUTPUT_VARIABLE TT_OUT diff --git a/llvm/cmake/modules/Makefile b/llvm/cmake/modules/Makefile deleted file mode 100644 index 044a1dfd375..00000000000 --- a/llvm/cmake/modules/Makefile +++ /dev/null @@ -1,150 +0,0 @@ -##===- cmake/modules/Makefile ------------------------------*- Makefile -*-===## -# -# The LLVM Compiler Infrastructure -# -# This file is distributed under the University of Illinois Open Source -# License. See LICENSE.TXT for details. -# -##===----------------------------------------------------------------------===## - -LEVEL = ../.. - -include $(LEVEL)/Makefile.common - -PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/share/llvm/cmake - -ifeq ($(DISABLE_ASSERTIONS),1) - LLVM_ENABLE_ASSERTIONS := 0 -else - LLVM_ENABLE_ASSERTIONS := 1 -endif - -ifeq ($(ENABLE_ABI_BREAKING_CHECKS),1) - LLVM_ABI_BREAKING_CHECKS := FORCE_ON -else - LLVM_ABI_BREAKING_CHECKS := FORCE_OFF -endif - -ifeq ($(REQUIRES_EH),1) - LLVM_ENABLE_EH := 1 -else - LLVM_ENABLE_EH := 0 -endif - -ifeq ($(REQUIRES_RTTI),1) - LLVM_ENABLE_RTTI := 1 -else - LLVM_ENABLE_RTTI := 0 -endif - -ifndef LLVM_LIBS_TO_EXPORT -$(error LLVM_LIBS_TO_EXPORT cannot be empty) -endif - -OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake - -LLVM_CONFIG_CODE := \ -\# Compute the CMake directory from the LLVMConfig.cmake file location.\n\ -get_filename_component(_LLVM_CMAKE_DIR "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n\ -\# Compute the installation prefix from the LLVMConfig.cmake file location.\n\ -get_filename_component(LLVM_INSTALL_PREFIX "$${CMAKE_CURRENT_LIST_FILE}" PATH)\n - -# Compute number of levels (typically 3 - ``share/llvm/cmake/``) to PROJ_prefix -# from PROJ_cmake, then emit the appropriate number of calls to -# get_filename_components(). Note this assumes there are no spaces in the -# cmake_path_suffix variable. -cmake_path_suffix := $(subst $(PROJ_prefix),,$(subst $(DESTDIR),,$(PROJ_cmake))) -cmake_path_dirs := $(subst /, ,$(cmake_path_suffix)) -LLVM_CONFIG_CODE += $(foreach __not_used,$(cmake_path_dirs),get_filename_component(LLVM_INSTALL_PREFIX "$${LLVM_INSTALL_PREFIX}" PATH)\n) - -LLVM_CONFIG_CODE += set(_LLVM_LIBRARY_DIR "$${LLVM_INSTALL_PREFIX}\/lib") - -$(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in Makefile $(LLVMBuildCMakeFrag) - $(Echo) 'Generating LLVM CMake package config file' - $(Verb) ( \ - cat $< | sed \ - -e 's/@LLVM_CONFIG_CODE@/$(LLVM_CONFIG_CODE)/' \ - -e 's/@LLVM_VERSION_MAJOR@/'"$(LLVM_VERSION_MAJOR)"'/' \ - -e 's/@LLVM_VERSION_MINOR@/'"$(LLVM_VERSION_MINOR)"'/' \ - -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \ - -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ - -e 's/@LLVM_COMMON_DEPENDS@//' \ - -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \ - -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \ - -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \ - -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \ - -e 's/@TARGET_TRIPLE@/'"$(TARGET_TRIPLE)"'/' \ - -e 's/@LLVM_ABI_BREAKING_CHECKS@/'"$(LLVM_ABI_BREAKING_CHECKS)"'/' \ - -e 's/@LLVM_ENABLE_ASSERTIONS@/'"$(LLVM_ENABLE_ASSERTIONS)"'/' \ - -e 's/@LLVM_ENABLE_EH@/'"$(LLVM_ENABLE_EH)"'/' \ - -e 's/@LLVM_ENABLE_RTTI@/'"$(LLVM_ENABLE_RTTI)"'/' \ - -e 's/@LLVM_ENABLE_TERMINFO@/'"$(ENABLE_TERMINFO)"'/' \ - -e 's/@LLVM_ENABLE_THREADS@/'"$(ENABLE_THREADS)"'/' \ - -e 's/@LLVM_ENABLE_ZLIB@/'"$(ENABLE_ZLIB)"'/' \ - -e 's/@LLVM_NATIVE_ARCH@/'"$(LLVM_NATIVE_ARCH)"'/' \ - -e 's/@LLVM_ENABLE_PIC@/'"$(ENABLE_PIC)"'/' \ - -e 's/@LLVM_ON_UNIX@/'"$(LLVM_ON_UNIX)"'/' \ - -e 's/@LLVM_ON_WIN32@/'"$(LLVM_ON_WIN32)"'/' \ - -e 's/@LLVM_LIBDIR_SUFFIX@//' \ - -e 's#@LLVM_CONFIG_INCLUDE_DIRS@#$${LLVM_INSTALL_PREFIX}/include#' \ - -e 's#@LLVM_CONFIG_LIBRARY_DIRS@#$${_LLVM_LIBRARY_DIR}#' \ - -e 's#@LLVM_CONFIG_CMAKE_DIR@#$${_LLVM_CMAKE_DIR}#' \ - -e 's#@LLVM_CONFIG_TOOLS_BINARY_DIR@#$${LLVM_INSTALL_PREFIX}/bin#' \ - -e 's/@LLVM_CONFIG_EXPORTS_FILE@/$${LLVM_CMAKE_DIR}\/LLVMExports.cmake/' \ - -e 's/@all_llvm_lib_deps@//' \ - && \ - ( grep '^set_property.*LLVMBUILD_LIB_DEPS_' "$(LLVMBuildCMakeFrag)" | \ - grep -v LLVMBUILD_LIB_DEPS_gtest ) && \ - echo 'unset(_LLVM_CMAKE_DIR)' && \ - echo 'unset(_LLVM_LIBRARY_DIR)' \ - ) > $@ - -$(PROJ_OBJ_DIR)/LLVMConfigVersion.cmake: LLVMConfigVersion.cmake.in Makefile - $(Echo) 'Generating LLVM CMake package version file' - $(Verb) cat $< | sed \ - -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \ - -e 's/@LLVM_VERSION_MAJOR@/'"$(LLVM_VERSION_MAJOR)"'/' \ - -e 's/@LLVM_VERSION_MINOR@/'"$(LLVM_VERSION_MINOR)"'/' \ - -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \ - > $@ - -$(PROJ_OBJ_DIR)/LLVMExports.cmake: $(LLVMBuildCMakeExportsFrag) Makefile - $(Echo) 'Generating LLVM CMake target exports file' - $(Verb) ( \ - echo '# LLVM CMake target exports. Do not include directly.' && \ - for lib in $(LLVM_LIBS_TO_EXPORT); do \ - echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ - echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "$${_LLVM_LIBRARY_DIR}/'lib$$lib.a'")' ; \ - done && \ - cat "$(LLVMBuildCMakeExportsFrag)" && \ - echo 'set_property(TARGET LLVMSupport APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES '"$(subst -l,,$(LIBS))"')' \ - ) > $@ - -all-local:: $(addprefix $(PROJ_OBJ_DIR)/, $(OBJMODS)) - -SKIPSRCMODS := \ - CheckAtomic.cmake \ - GetHostTriple.cmake \ - LLVMBuildExports.cmake \ - LLVMConfig.cmake \ - LLVMConfigVersion.cmake \ - LLVMExports.cmake - -SRCMODS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.cmake)) -SRCMODS := $(filter-out $(SKIPSRCMODS),$(SRCMODS)) -INSTSRCMODS := $(addprefix $(PROJ_cmake)/, $(SRCMODS)) -INSTOBJMODS := $(addprefix $(PROJ_cmake)/, $(OBJMODS)) - -$(PROJ_cmake): - $(Echo) Making install directory: $@ - $(Verb) $(MKDIR) $@ - -$(INSTSRCMODS): $(PROJ_cmake)/%.cmake: $(PROJ_SRC_DIR)/%.cmake | $(PROJ_cmake) - $(Echo) Installing cmake modules: $(notdir $<) - $(Verb) $(DataInstall) $< $(PROJ_cmake) - -$(INSTOBJMODS): $(PROJ_cmake)/%.cmake: $(PROJ_OBJ_DIR)/%.cmake | $(PROJ_cmake) - $(Echo) Installing cmake modules: $(notdir $<) - $(Verb) $(DataInstall) $< $(PROJ_cmake) - -install-local:: $(INSTSRCMODS) $(INSTOBJMODS) |