mirror of
https://github.com/nasa/trick.git
synced 2024-12-24 07:16:41 +00:00
Build fails on Ubuntu 16.04
The recently introduced configure time test fails to run on RedHat 6 machines. refs #174
This commit is contained in:
parent
149e01a4c9
commit
0f7a396db1
@ -217,7 +217,8 @@ AC_CHECK_FILE([$LLVM_LIB_DIR/libLLVMSupport.a],
|
||||
)
|
||||
AC_PATH_PROG(CLANG, clang, noclang, "$LLVM_BIN_DIR:$LLVM_HOME/bin:/bin:/usr/bin:/usr/local/bin:/sw/bin")
|
||||
AS_IF([test "$ac_cv_path_CLANG" = "noclang"],AC_MSG_ERROR([could not find clang]),[])
|
||||
AX_TEST_CLANG
|
||||
dnl does not work under RedHat 6
|
||||
dnl AX_TEST_CLANG
|
||||
|
||||
dnl look for udunits in /usr/include and /usr/include/udunits2
|
||||
AX_UDUNITS_HOME([])
|
||||
|
41
configure
vendored
41
configure
vendored
@ -5751,47 +5751,6 @@ if test "$ac_cv_path_CLANG" = "noclang"; then :
|
||||
as_fn_error $? "could not find clang" "$LINENO" 5
|
||||
fi
|
||||
|
||||
LLVM_INCLUDE_DIR=`$LLVM_CONFIG --includedir`
|
||||
LLVM_ALL_LD_FLAGS=`$LLVM_CONFIG --ldflags --libs`
|
||||
if LLVM_SYSTEM_LD_FLAGS=`$LLVM_CONFIG --system-libs 2>/dev/null`; then :
|
||||
|
||||
fi
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
|
||||
|
||||
$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
|
||||
|
||||
$as_echo "#define __STDC_FORMAT_MACROS 1" >>confdefs.h
|
||||
|
||||
$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
|
||||
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
#include "llvm/Support/Host.h"
|
||||
int
|
||||
main ()
|
||||
{
|
||||
llvm::sys::getDefaultTargetTriple(); return 0;
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang works properly" >&5
|
||||
$as_echo_n "checking if clang works properly... " >&6; }
|
||||
${CLANG}++ conftest.cpp --std=c++11 -I${LLVM_INCLUDE_DIR} ${LLVM_ALL_LD_FLAGS} ${LLVM_SYSTEM_LD_FLAGS} >&5
|
||||
if test $? == 0 ; then :
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
as_fn_error $? "cannot use ${CLANG}. Download clang/llvm directly from http://llvm.org" "$LINENO" 5
|
||||
|
||||
fi
|
||||
/bin/rm -f a.out
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-udunits was given.
|
||||
|
Loading…
Reference in New Issue
Block a user