X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=autoconf%2Fconfigure.ac;h=7e710080ea070eb0a1dc360c42363d86ee4a62f6;hp=3d0a2b3b1b78702563c4d95276fb0b5ddc394c47;hb=070764ee855463a2c9224138bc056fa4f2ef06da;hpb=0cc6c9b3d9abc5c5a901bfa5a039b436a3c14018 diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 3d0a2b3b1b7..7e710080ea0 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -66,8 +66,8 @@ dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). dnl We need to check for the compiler up here to avoid anything else dnl starting with a different one. -AC_PROG_CC(clang llvm-gcc gcc) -AC_PROG_CXX(clang++ llvm-g++ g++) +AC_PROG_CC(clang gcc) +AC_PROG_CXX(clang++ g++) AC_PROG_CPP dnl If CXX is Clang, check that it can find and parse C++ standard library @@ -96,6 +96,25 @@ if test "$CXX" = "clang++" ; then AC_LANG_POP([C++]) fi +dnl Set up variables that track whether the host compiler is GCC or Clang where +dnl we can effectively sanity check them. We don't try to sanity check all the +dnl other possible compilers. +AC_MSG_CHECKING([whether GCC or Clang is our host compiler]) +AC_LANG_PUSH([C++]) +llvm_cv_cxx_compiler=unknown +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __clang__ + #error + #endif + ]])], + llvm_cv_cxx_compiler=clang, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __GNUC__ + #error + #endif + ]])], + llvm_cv_cxx_compiler=gcc, [])]) +AC_LANG_POP([C++]) +AC_MSG_RESULT([${llvm_cv_cxx_compiler}]) + dnl Configure all of the projects present in our source tree. While we could dnl just AC_CONFIG_SUBDIRS on the set of directories in projects that have a dnl configure script, that usage of the AC_CONFIG_SUBDIRS macro is deprecated. @@ -109,11 +128,6 @@ dnl created before running the configure scripts of projects that depend upon dnl them. dnl -dnl Several projects use llvm-gcc, so configure that first -if test -d ${srcdir}/projects/llvm-gcc ; then - AC_CONFIG_SUBDIRS([projects/llvm-gcc]) -fi - dnl Several projects use the LLVM test suite, so configure it next. if test -d ${srcdir}/projects/test-suite ; then AC_CONFIG_SUBDIRS([projects/test-suite]) @@ -140,15 +154,8 @@ do if test -d ${srcdir}/projects/${i} ; then case ${i} in sample) AC_CONFIG_SUBDIRS([projects/sample]) ;; - privbracket) AC_CONFIG_SUBDIRS([projects/privbracket]) ;; - llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;; - llvm-reopt) AC_CONFIG_SUBDIRS([projects/llvm-reopt]);; - llvm-java) AC_CONFIG_SUBDIRS([projects/llvm-java]) ;; - llvm-tv) AC_CONFIG_SUBDIRS([projects/llvm-tv]) ;; safecode) AC_CONFIG_SUBDIRS([projects/safecode]) ;; - llvm-kernel) AC_CONFIG_SUBDIRS([projects/llvm-kernel]) ;; compiler-rt) ;; - llvm-gcc) ;; test-suite) ;; llvm-test) ;; poolalloc) ;; @@ -451,9 +458,6 @@ fi AC_SUBST(HOST_ARCH,$host_arch) -dnl Check for the endianness of the target -AC_C_BIGENDIAN(AC_SUBST([ENDIAN],[big]),AC_SUBST([ENDIAN],[little])) - dnl Check for build platform executable suffix if we're cross-compiling if test "$cross_compiling" = yes; then AC_SUBST(LLVM_CROSS_COMPILING, [1]) @@ -503,6 +507,87 @@ case "$enableval" in *) AC_MSG_ERROR([Invalid setting for --enable-libcpp. Use "yes" or "no"]) ;; esac +dnl Check both GCC and Clang for sufficiently modern versions. These checks can +dnl be bypassed by passing a flag if necessary on a platform. We have to do +dnl these checks here so that we have the configuration of the standard C++ +dnl library finished. +AC_ARG_ENABLE(compiler-version-checks, + AS_HELP_STRING([--enable-compiler-version-checks], + [Check the version of the host compiler (default is YES)]),, + enableval=default) +case "$enableval" in + no) + ;; + yes|default) + AC_LANG_PUSH([C++]) + case "$llvm_cv_cxx_compiler" in + clang) + AC_MSG_CHECKING([whether Clang is new enough]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 1) +#error This version of Clang is too old to build LLVM +#endif +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([ +The selected Clang compiler is not new enough to build LLVM. Please upgrade to +Clang 3.1. You may pass --disable-compiler-version-checks to configure to +bypass these sanity checks.])]) + + dnl Note that libstdc++4.6 is known broken for C++11 builds. The errors + dnl are sometimes deeply confusing though. Here we test for an obvious + dnl incomplete feature in 4.6's standard library that was completed in + dnl 4.7's. We also have to disable this test if 'ENABLE_LIBCPP' is set + dnl because the enable flags don't actually fix CXXFLAGS, they rely on + dnl that happening in the Makefile. + if test "$ENABLE_LIBCPP" -eq 0 ; then + AC_MSG_CHECKING([whether Clang will select a modern C++ standard library]) + llvm_cv_old_cxxflags="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS -std=c++0x" + AC_LINK_IFELSE([AC_LANG_SOURCE([[ +#include +std::atomic x(0.0f); +int main() { return (float)x; } +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([ +We detected a missing feature in the standard C++ library that was known to be +missing in libstdc++4.6 and implemented in libstdc++4.7. There are numerous +C++11 problems with 4.6's library, and we don't support GCCs or libstdc++ older +than 4.7. You will need to update your system and ensure Clang uses the newer +standard library. + +If this error is incorrect or you need to force things to work, you may pass +'--disable-compiler-version-checks' to configure to bypass this test.])]) + CXXFLAGS="$llvm_cv_old_cxxflags" + fi + ;; + gcc) + AC_MSG_CHECKING([whether GCC is new enough]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7) +#error This version of GCC is too old to build LLVM +#endif +]])], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([ +The selected GCC C++ compiler is not new enough to build LLVM. Please upgrade +to GCC 4.7. You may pass --disable-compiler-version-checks to configure to +bypass these sanity checks.])]) + ;; + unknown) + ;; + esac + AC_LANG_POP([C++]) + ;; + *) + AC_MSG_ERROR([Invalid setting for --enable-compiler-version-checks. Use "yes" or "no"]) + ;; +esac + dnl --enable-cxx11 : check whether or not to use -std=c++11 on the command line AC_ARG_ENABLE(cxx11, AS_HELP_STRING([--enable-cxx11],