From af49208035ffd6f9442ea15eae6cab3e752d205f Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 12 Oct 2009 04:00:11 +0000 Subject: [PATCH] Fix LLVM CMake build system so that it may now work on Solaris and AuroraUX. llvm-svn: 83819 --- CMakeLists.txt | 4 ++++ cmake/config-ix.cmake | 1 + include/llvm/Config/config.h.cmake | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b22a8c239d1..f7126584ba7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,6 +221,10 @@ endif( MSVC ) include_directories( ${LLVM_BINARY_DIR}/include ${LLVM_MAIN_INCLUDE_DIR}) +if( ${CMAKE_SYSTEM_NAME} MATCHES SunOS ) + SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-include llvm/System/Solaris.h") +endif( ${CMAKE_SYSTEM_NAME} MATCHES SunOS ) + include(AddLLVM) include(TableGen) diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 320aaf89940..320335cf0fe 100755 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -75,6 +75,7 @@ check_symbol_exists(setrlimit sys/resource.h HAVE_SETRLIMIT) check_function_exists(isatty HAVE_ISATTY) check_symbol_exists(isinf cmath HAVE_ISINF_IN_CMATH) check_symbol_exists(isinf math.h HAVE_ISINF_IN_MATH_H) +check_symbol_exists(finite ieeefp.h HAVE_FINITE_IN_IEEEFP_H) check_symbol_exists(isnan cmath HAVE_ISNAN_IN_CMATH) check_symbol_exists(isnan math.h HAVE_ISNAN_IN_MATH_H) check_symbol_exists(ceilf math.h HAVE_CEILF) diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake index d8de146c8c2..fa5d316ef07 100644 --- a/include/llvm/Config/config.h.cmake +++ b/include/llvm/Config/config.h.cmake @@ -98,7 +98,7 @@ #cmakedefine HAVE_FCNTL_H ${HAVE_FCNTL_H} /* Set to 1 if the finite function is found in */ -#undef HAVE_FINITE_IN_IEEEFP_H +#cmakedefine HAVE_FINITE_IN_IEEEFP_H ${HAVE_FINITE_IN_IEEEFP_H} /* Define to 1 if you have the `floorf' function. */ #cmakedefine HAVE_FLOORF ${HAVE_FLOORF} @@ -289,7 +289,7 @@ #undef HAVE_ROUNDF /* Define to 1 if you have the `sbrk' function. */ -#undef HAVE_SBRK +#cmakedefine HAVE_SBRK ${HAVE_SBRK} /* Define to 1 if you have the `setenv' function. */ #cmakedefine HAVE_SETENV ${HAVE_SETENV}