# 24314621 LLVM should build using the new CMake based build system

# CMake parts for upstream, Solaris-specific parts no.

--- Makefile.config.in	2015-08-07 12:44:47.000000000 -0400

+++ Makefile.config.in	2016-05-08 23:19:20.538430899 -0400

@@ -12,6 +12,12 @@

 #

 #===------------------------------------------------------------------------===#

+MACH = $(shell uname -p)

+MACH64=sparcv9

+ifeq ($(MACH),i386)

+  MACH64=amd64

+endif

+

 # Define LLVM specific info and directories based on the autoconf variables

 LLVMPackageName   := @PACKAGE_TARNAME@

 LLVMVersion       := @PACKAGE_VERSION@

@@ -185,6 +191,11 @@

 # Path to the nm program

 NM_PATH = @NM@

+# Solaris-specific filesystem locations

+ifeq ($(findstring m32,$(CXXFLAGS)),)

+  PROJ_libdir = $(PROJ_prefix)/lib/$(MACH64)

+endif

+

 # The pathnames of the programs we require to build

 CMP        := @CMP@

 CP         := @CP@

@@ -225,6 +236,12 @@

 LIBS       := @LIBS@

+ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+  ifeq ($(MACH),sparc)

+    LIBS += -lkstat

+  endif

+endif

+

 # Targets that are possible to build

 ALL_TARGETS := @ALL_TARGETS@

@@ -347,14 +364,14 @@

 ENABLE_EMBED_STDCXX := @ENABLE_EMBED_STDCXX@

 # Use -fvisibility-inlines-hidden?

-ENABLE_VISIBILITY_INLINES_HIDDEN := @ENABLE_VISIBILITY_INLINES_HIDDEN@

+ENABLE_VISIBILITY_INLINES_HIDDEN := 0

 # Do we want to allow timestamping information into builds?

 ENABLE_TIMESTAMPS := @ENABLE_TIMESTAMPS@

 # This option tells the Makefiles to produce verbose output.

 # It essentially prints the commands that make is executing

-#VERBOSE = 1

+VERBOSE := 1

 # Enable JIT for this platform

 TARGET_HAS_JIT = @TARGET_HAS_JIT@

###

--- Makefile.rules	2015-11-09 08:10:00.000000000 -0800

+++ Makefile.rules	2016-05-28 17:08:22.413887137 -0700

@@ -291,8 +291,8 @@

   LD.Flags  += $(OPTIMIZE_OPTION)

   ifdef DEBUG_SYMBOLS

     BuildMode := $(BuildMode)+Debug

-    CXX.Flags += -g

-    C.Flags   += -g

+    CXX.Flags += -g3

+    C.Flags   += -g3

     KEEP_SYMBOLS := 1

   endif

 else

@@ -307,8 +307,8 @@

     CXX.Flags += -gsplit-dwarf

     C.Flags   += -gsplit-dwarf

     else

-    CXX.Flags += -g

-    C.Flags   += -g

+    CXX.Flags += -g3

+    C.Flags   += -g3

     endif

     KEEP_SYMBOLS := 1

   endif

@@ -331,6 +331,13 @@

  endif

 endif

+ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+  REQUIRES_EH := 1

+  REQUIRES_FRAME_POINTER := 1

+else

+  REQUIRES_EH := 0

+endif

+

 ifeq ($(ENABLE_WERROR),1)

   CXX.Flags += -Werror

   C.Flags += -Werror

@@ -355,14 +362,16 @@

 endif

 # IF REQUIRES_EH=1 is specified then don't disable exceptions

-ifndef REQUIRES_EH

+ifneq ($(REQUIRES_EH), 1)

   CXX.Flags += -fno-exceptions

+  REQUIRES_RTTI := 0

 else

   # If the library requires EH, it also requires RTTI.

+  CXX.Flags += -fexceptions

   REQUIRES_RTTI := 1

 endif

-ifdef REQUIRES_FRAME_POINTER

+ifeq ($(REQUIRES_FRAME_POINTER), 1)

   CXX.Flags := $(filter-out -fomit-frame-pointer,$(CXX.Flags))

   C.Flags   := $(filter-out -fomit-frame-pointer,$(C.Flags))

   LD.Flags  := $(filter-out -fomit-frame-pointer,$(LD.Flags))

@@ -371,6 +380,8 @@

 # If REQUIRES_RTTI=1 is specified then don't disable run-time type id.

 ifneq ($(REQUIRES_RTTI), 1)

   CXX.Flags += -fno-rtti

+else

+  CXX.Flags += -frtti

 endif

 ifeq ($(ENABLE_COVERAGE),1)

@@ -596,7 +607,7 @@

 endif

 ifdef SHARED_LIBRARY

-ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))

+ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW SunOS))

 ifneq ($(HOST_OS),Darwin)

   LD.Flags += $(RPATH) -Wl,'$$ORIGIN'

 else

@@ -646,9 +657,13 @@

     ifeq ($(HOST_OS),SunOS)

       LD.Flags += -Wl,-z -Wl,discard-unused=sections

     else

-      ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))

+      ifneq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW SunOS))

         LD.Flags += -Wl,--gc-sections

       endif

+      ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+	LD.Flags += -Wl,-z -Wl,discard-unused=sections

+	LD.Flags += -Wl,-M -Wl,$(PROJ_SRC_ROOT)/mapfiles/map.gnu-sections

+      endif

     endif

   endif

 endif

@@ -660,8 +675,14 @@

   endif

   ifneq ($(HOST_OS), Darwin)

     ifdef TOOLNAME

+      ifneq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

       LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'

     endif

+      ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+	LD.Flags += -Wl,-z -Wl,discard-unused=sections

+	LD.Flags += -Wl,-M -Wl,$(PROJ_SRC_ROOT)/mapfiles/map.gnu-sections

+      endif

+    endif

   else

     ifneq ($(DARWIN_MAJVERS),4)

       LD.Flags += $(RPATH) -Wl,@executable_path/../lib

@@ -1105,6 +1126,18 @@

 clean-local::

 	-$(Verb) $(RM) -f $(NativeExportsFile)

 else

+ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+# Solaris ld requires a version script rather than a plain list.

+NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE)).map

+$(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir

+    $(Verb) echo "{" > $@

+    $(Verb) ggrep -q '[[:alnum:]_]' $< && echo "  global:" >> $@ || :

+    $(Verb) gsed -e 's/$$/;/' -e 's/^/    /' < $< >> $@

+    $(Verb) echo "  local: *;" >> $@

+    $(Verb) echo "};" >> $@

+clean-local::

+    -$(Verb) $(RM) -f $(NativeExportsFile)

+else

 ifeq ($(HAVE_LINK_VERSION_SCRIPT),1)

 # Gold and BFD ld require a version script rather than a plain list.

 NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE)).map

@@ -1134,6 +1167,7 @@

 endif

 endif

 endif

+endif

 # Now add the linker command-line options to use the native export file.

@@ -1153,6 +1187,11 @@

 SharedLinkOptions += $(NativeExportsFile)

 endif

+# Solaris

+ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+LLVMLibsOptions += -Wl,-M -Wl,$(NativeExportsFile)

+endif

+

 endif

 ###############################################################################

###

--- lib/Support/CMakeLists.txt	2015-12-14 16:59:19.000000000 -0800

+++ lib/Support/CMakeLists.txt	2016-07-11 13:59:48.145404115 -0700

@@ -28,6 +28,16 @@

   endif( MINGW )

 endif( NOT MSVC )

+# On Solaris, -lkstat is only needed on SPARC.

+if(CMAKE_HOST_SOLARIS)

+  set(UNAME "")

+  execute_process(COMMAND uname -p OUTPUT_VARIABLE UNAME)

+  if("${UNAME}" MATCHES "sparc")

+    message(INFO "Adding -lkstat to link line.")

+    set(system_libs ${system_libs} kstat)

+  endif()

+endif()

+

 add_llvm_library(LLVMSupport

   APFloat.cpp

   APInt.cpp

###

--- tools/clang/include/clang/Basic/Makefile	2014-03-31 09:14:44.000000000 -0400

+++ tools/clang/include/clang/Basic/Makefile	2016-05-08 23:19:20.552431239 -0400

@@ -16,8 +16,17 @@

 INPUT_TDS = $(wildcard $(PROJ_SRC_DIR)/Diagnostic*.td)

+SVN_OR_RC :=

+

 # Compute the Clang version from the LLVM version, unless specified explicitly.

 ifndef CLANG_VERSION

+ifeq ($(LLVMVersion), $(findstring svn, $(LLVMVersion)), svn)

+  SVN_OR_RC := "svn"

+endif

+

+ifeq ($(LLVMVersion), $(findstring rc, $(LLVMVersion)), rc)

+  SVN_OR_RC := "rc"

+endif

 CLANG_VERSION := $(subst svn,,$(LLVMVersion))

 CLANG_VERSION := $(subst rc,,$(CLANG_VERSION))

 endif

@@ -26,6 +35,14 @@

 CLANG_VERSION_MAJOR := $(word 1,$(CLANG_VERSION_COMPONENTS))

 CLANG_VERSION_MINOR := $(word 2,$(CLANG_VERSION_COMPONENTS))

 CLANG_VERSION_PATCHLEVEL := $(word 3,$(CLANG_VERSION_COMPONENTS))

+CLANG_VERSION_TAGGED_STRING :=

+

+ifeq ($(SVN_OR_RC),)

+  CLANG_VERSION_TAGGED_STRING := "\"\(tags/RELEASE_$(CLANG_VERSION_MAJOR)$(CLANG_VERSION_MINOR)$(CLANG_VERSION_PATCHLEVEL)/final\)\""

+else

+  CLANG_VERSION_TAGGED_STRING := "\"\(tags/RELEASE_$(CLANG_VERSION_MAJOR)$(CLANG_VERSION_MINOR)$(CLANG_VERSION_PATCHLEVEL)/$(SVN_OR_RC)\)\""

+endif

+

 ifeq ($(CLANG_VERSION_PATCHLEVEL),)

 CLANG_HAS_VERSION_PATCHLEVEL := 0

 else

@@ -67,4 +84,5 @@

 	           -e "s#@CLANG_VERSION_MINOR@#$(CLANG_VERSION_MINOR)#g" \

 	           -e "s#@CLANG_VERSION_PATCHLEVEL@#$(CLANG_VERSION_PATCHLEVEL)#g" \

 	           -e "s#@CLANG_HAS_VERSION_PATCHLEVEL@#$(CLANG_HAS_VERSION_PATCHLEVEL)#g" \

+		   -e "s#@CLANG_VERSION_TAGGED_STRING@#$(CLANG_VERSION_TAGGED_STRING:' '='')#g" \

 	           $< > $@

###

--- tools/clang/tools/libclang/Makefile	2015-07-07 21:00:30.000000000 -0400

+++ tools/clang/tools/libclang/Makefile	2016-05-08 23:19:20.577431847 -0400

@@ -35,10 +35,16 @@

 include $(CLANG_LEVEL)/Makefile

 # Add soname to the library.

-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD))

+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU GNU/kFreeBSD SunOS))

         LLVMLibsOptions += -Wl,-soname,lib$(LIBRARYNAME)$(SHLIBEXT)

 endif

+# Extract everything necessary from Solaris *.a archives

+ifeq ($(HOST_OS), $(filter $(HOST_OS), SunOS))

+  SharedLinkOptions += -Wl,-z -Wl,rescan-now -Wl,-z -Wl,allextract

+  LLVMLibsOptions += -Wl,-z -Wl,defaultextract

+endif

+

 ifeq ($(ENABLE_CLANG_ARCMT),1)

   CXX.Flags += -DCLANG_ENABLE_ARCMT

 endif

###

--- tools/llvm-shlib/Makefile	2014-08-01 02:16:03.000000000 -0400

+++ tools/llvm-shlib/Makefile	2016-05-08 23:19:20.579431896 -0400

@@ -71,7 +71,10 @@

 ifeq ($(HOST_OS),SunOS)

     # add -z allextract ahead of other libraries on Solaris

-    LLVMLibsOptions := -Wl,-z -Wl,allextract $(LLVMLibsOptions)

+    LLVMLibsOptions := -Wl,-z -Wl,rescan -Wl,-z -Wl,allextract $(LLVMLibsOptions)

+    LLVMLibsOptions += -Wl,-h -Wl,lib$(LIBRARYNAME)$(SHLIBEXT)

+    LLVMLibsOptions += -Wl,-z -Wl,defaultextract -Wl,-z -Wl,defs

+    LLVMLibsOptions += -lkstat

 endif

 ifeq ($(HOST_OS), $(filter $(HOST_OS), Cygwin MingW))

###

--- tools/clang/tools/libclang/CMakeLists.txt	2015-11-11 16:46:57.000000000 -0800

+++ tools/clang/tools/libclang/CMakeLists.txt	2016-05-15 17:35:29.587888133 -0700

@@ -92,6 +92,7 @@

   LINK_COMPONENTS

   ${LLVM_TARGETS_TO_BUILD}

+

   Core

   Support

   )

@@ -108,6 +109,9 @@

     set_property(TARGET libclang APPEND_STRING PROPERTY

                  LINK_FLAGS ${LIBCLANG_LINK_FLAGS})

+  elseif(CMAKE_HOST_SOLARIS)

+    set(LIBCLANG_LINK_FLAGS " -Wl,-z -Wl,allextract -Wl,-z -Wl,defs -Bsymbolic-functions ")

+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LIBCLANG_LINK_FLAGS}")

   else()

     set_target_properties(libclang

       PROPERTIES

###

--- tools/llvm-shlib/CMakeLists.txt	2015-11-04 14:11:12.000000000 -0900

+++ tools/llvm-shlib/CMakeLists.txt	2016-07-05 22:08:15.168330085 -0800

@@ -40,12 +40,18 @@

 add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${SOURCES})

-list(REMOVE_DUPLICATES LIB_NAMES)

+if (LIB_NAMES)

+  list(REMOVE_DUPLICATES "LIB_NAMES")

+endif()

+

 if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") # FIXME: It should be "GNU ld for elf"

   # GNU ld doesn't resolve symbols in the version script.

   set(LIB_NAMES -Wl,--whole-archive ${LIB_NAMES} -Wl,--no-whole-archive)

 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

   set(LIB_NAMES -Wl,-all_load ${LIB_NAMES})

+elseif(CMAKE_HOST_SOLARIS)

+  set(LIB_NAMES -Wl,-z -Wl,defs -Wl,-Bsymbolic-functions -Wl,-z -Wl,allextract ${LIB_NAMES} -Wl,-z -Wl,defaultextract)

+  # message(STATUS "LIB_NAMES: ${LIB_NAMES}")

 endif()

 target_link_libraries(LLVM PRIVATE ${LIB_NAMES})

###

--- cmake/modules/HandleLLVMOptions.cmake	2016-01-06 11:05:19.000000000 -0800

+++ cmake/modules/HandleLLVMOptions.cmake	2016-05-18 19:22:28.803960478 -0700

@@ -132,6 +132,7 @@

 # Pass -Wl,-z,defs. This makes sure all symbols are defined. Otherwise a DSO

 # build might work on ELF but fail on MachO/COFF.

 if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR

+        CMAKE_HOST_SOLARIS OR

         ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR

         ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND

    NOT LLVM_USE_SANITIZER)

@@ -185,13 +186,13 @@

   endif()

 endif()

-if(NOT WIN32 AND NOT CYGWIN)

+if(NOT WIN32 AND NOT CYGWIN AND NOT CMAKE_HOST_SOLARIS)

   # MinGW warns if -fvisibility-inlines-hidden is used.

   check_cxx_compiler_flag("-fvisibility-inlines-hidden" SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)

   append_if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG "-fvisibility-inlines-hidden" CMAKE_CXX_FLAGS)

 endif()

-if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )

+if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 AND NOT CMAKE_HOST_SOLARIS )

   # TODO: support other platforms and toolchains.

   if( LLVM_BUILD_32_BITS )

     message(STATUS "Building 32 bits executables and libraries.")

@@ -200,10 +201,12 @@

     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -m32")

     set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -m32")

   endif( LLVM_BUILD_32_BITS )

-endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )

+endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 AND NOT CMAKE_HOST_SOLARIS )

 if (LLVM_BUILD_STATIC)

+  if (NOT CMAKE_HOST_SOLARIS)

   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")

+  endif(CMAKE_HOST_SOLARIS)

 endif()

 if( XCODE )

###

--- lib/Transforms/Hello/CMakeLists.txt	2015-06-15 17:44:12.000000000 -0700

+++ lib/Transforms/Hello/CMakeLists.txt	2016-05-17 18:08:53.730103135 -0700

@@ -1,14 +1,18 @@

 # If we don't need RTTI or EH, there's no reason to export anything

 # from the hello plugin.

-if( NOT LLVM_REQUIRES_RTTI )

-  if( NOT LLVM_REQUIRES_EH )

-    set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Hello.exports)

-  endif()

-endif()

+# It doesn't export anything anyway, regardless of RTTI or no RTTI.

+# Why does it need an empty linker mapfile?

+IF (NOT CMAKE_HOST_SOLARIS)

+  IF (NOT LLVM_REQUIRES_RTTI)

+    IF (NOT LLVM_REQUIRES_EH)

+      SET (LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/Hello.exports)

+    ENDIF()

+  ENDIF()

+ENDIF()

-if(WIN32 OR CYGWIN)

-  set(LLVM_LINK_COMPONENTS Core Support)

-endif()

+if(WIN32 OR CYGWIN OR CMAKE_HOST_SOLARIS)

+  SET (LLVM_LINK_COMPONENTS Core Support)

+ENDIF()

 add_llvm_loadable_module( LLVMHello

   Hello.cpp

###

--- tools/clang/tools/driver/CMakeLists.txt	2015-11-10 04:51:25.000000000 -0800

+++ tools/clang/tools/driver/CMakeLists.txt	2016-05-21 07:44:27.981263031 -0700

@@ -1,3 +1,7 @@

+IF(CMAKE_HOST_SOLARIS)

+  include (GNUInstallDirs)

+ENDIF(CMAKE_HOST_SOLARIS)

+

 set( LLVM_LINK_COMPONENTS

   ${LLVM_TARGETS_TO_BUILD}

   Analysis

@@ -51,9 +55,15 @@

 add_dependencies(clang clang-headers)

+IF(CMAKE_HOST_SOLARIS)

+  install(TARGETS clang

+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

+    COMPONENT clang)

+ELSE()

 install(TARGETS clang

   RUNTIME DESTINATION bin

   COMPONENT clang)

+ENDIF()

 if(NOT CMAKE_CONFIGURATION_TYPES)

   add_custom_target(install-clang

--- tools/clang/tools/scan-view/CMakeLists.txt	2015-11-13 12:34:15.000000000 -0800

+++ tools/clang/tools/scan-view/CMakeLists.txt	2016-05-21 08:48:55.352488404 -0700

@@ -1,3 +1,7 @@

+IF(CMAKE_HOST_SOLARIS)

+  include(GNUInstallDirs)

+ENDIF(CMAKE_HOST_SOLARIS)

+

 option(CLANG_INSTALL_SCANVIEW "Install the scan-view tool" ON)

 set(BinFiles

@@ -21,7 +25,11 @@

                          ${CMAKE_BINARY_DIR}/bin/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})

+    IF(CMAKE_HOST_SOLARIS)

+      install(PROGRAMS bin/${BinFile} DESTINATION ${CMAKE_INSTALL_BINDIR})

+    ELSE()

     install(PROGRAMS bin/${BinFile} DESTINATION bin)

+    ENDIF()

   endforeach()

   foreach(ShareFile ${ShareFiles})

@@ -33,7 +41,12 @@

                          ${CMAKE_BINARY_DIR}/share/scan-view/

                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})

     list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})

+    IF(CMAKE_HOST_SOLARIS)

+      install(FILES share/${ShareFile} DESTINATION

+        ${CMAKE_INSTALL_DATAROOTDIR}//scan-view)

+    ELSE()

     install(FILES share/${ShareFile} DESTINATION share/scan-view)

+    ENDIF()

   endforeach()

   add_custom_target(scan-view ALL DEPENDS ${Depends})

--- tools/clang/tools/clang-check/CMakeLists.txt	2015-07-16 18:19:54.000000000 -0700

+++ tools/clang/tools/clang-check/CMakeLists.txt	2016-05-21 08:52:13.223643264 -0700

@@ -1,3 +1,7 @@

+IF (CMAKE_HOST_SOLARIS)

+  include(GNUInstallDirs)

+ENDIF(CMAKE_HOST_SOLARIS)

+

 set( LLVM_LINK_COMPONENTS

   ${LLVM_TARGETS_TO_BUILD}

   Option

@@ -18,5 +22,9 @@

   clangTooling

   )

-install(TARGETS clang-check

-  RUNTIME DESTINATION bin)

+IF(CMAKE_HOST_SOLARIS)

+  install(TARGETS clang-check RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

+ELSE()

+  install(TARGETS clang-check RUNTIME DESTINATION bin)

+ENDIF()

+

###

--- tools/clang/tools/diagtool/CMakeLists.txt	2014-02-20 23:59:59.000000000 -0800

+++ tools/clang/tools/diagtool/CMakeLists.txt	2016-05-23 06:25:56.330339818 -0700

@@ -1,6 +1,6 @@

-set(LLVM_LINK_COMPONENTS

-  Support

-  )

+include(GNUInstallDirs)

+

+set(LLVM_LINK_COMPONENTS Support)

 add_clang_executable(diagtool

   diagtool_main.cpp

@@ -13,11 +13,15 @@

 target_link_libraries(diagtool

   clangBasic

-  clangFrontend

-  )

+  clangFrontend)

 if(UNIX)

   set(CLANGXX_LINK_OR_COPY create_symlink)

 else()

   set(CLANGXX_LINK_OR_COPY copy)

 endif()