diff options
Diffstat (limited to 'cmake/modules/Makefile')
| -rw-r--r-- | cmake/modules/Makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/cmake/modules/Makefile b/cmake/modules/Makefile index 894067d6f5..8f20ddf4dc 100644 --- a/cmake/modules/Makefile +++ b/cmake/modules/Makefile @@ -17,10 +17,6 @@ PROJ_cmake := $(DESTDIR)$(PROJ_prefix)/share/llvm/cmake OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake -# TODO: Teach LLVM-Config.cmake to work without explicit terminfo libs. -TERMINFO_LIBS := tinfo terminfo curses ncurses ncursesw -TERMINFO_LIBS := $(filter $(TERMINFO_LIBS),$(subst -l,,$(LIBS))) - $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) $(Echo) 'Generating LLVM CMake package config file' $(Verb) ( \ @@ -40,11 +36,6 @@ $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMConfig.cmake.in $(LLVMBuildCMakeFrag) -e 's/@LLVM_ENABLE_ZLIB@/'"$(ENABLE_ZLIB)"'/' \ -e 's/@LLVM_NATIVE_ARCH@/'"$(LLVM_NATIVE_ARCH)"'/' \ -e 's/@LLVM_ENABLE_PIC@/'"$(ENABLE_PIC)"'/' \ - -e 's/@HAVE_TERMINFO@/'"$(HAVE_TERMINFO)"'/' \ - -e 's/@TERMINFO_LIBS@/'"$(TERMINFO_LIBS)"'/' \ - -e 's/@HAVE_LIBDL@/'"$(HAVE_DLOPEN)"'/' \ - -e 's/@HAVE_LIBPTHREAD@/'"$(HAVE_PTHREAD)"'/' \ - -e 's/@HAVE_LIBZ@/'"$(HAVE_LIBZ)"'/' \ -e 's/@LLVM_ON_UNIX@/'"$(LLVM_ON_UNIX)"'/' \ -e 's/@LLVM_ON_WIN32@/'"$(LLVM_ON_WIN32)"'/' \ -e 's/@LLVM_CONFIG_INCLUDE_DIRS@/'"$(subst /,\/,$(PROJ_includedir))"'/' \ @@ -70,9 +61,8 @@ $(PROJ_OBJ_DIR)/LLVMExports.cmake: $(LLVMBuildCMakeExportsFrag) echo 'add_library('"$$lib"' STATIC IMPORTED)' && \ echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \ done && \ - cat "$(LLVMBuildCMakeExportsFrag)" \ - && echo '# System libs depend on LLVMSupport.' \ - && echo 'set_property(TARGET LLVMSupport PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES $(patsubst -l%,%,$(LIBS)))' \ + cat "$(LLVMBuildCMakeExportsFrag)" && \ + echo 'set_property(TARGET LLVMSupport APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES '"$(subst -l,,$(LIBS))"')' \ ) | grep -v gtest > $@ all-local:: $(addprefix $(PROJ_OBJ_DIR)/, $(OBJMODS)) |