mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-10-18 18:42:46 +02:00
[autoconf] Fix MinGW build
This is the autoconf analog of r251201. I realize autoconf is deprecated, but while it's in tree, it should at least be kept working. Also add the deprecation message to configure.ac such that AutoRegen actually picks ip up. llvm-svn: 254215
This commit is contained in:
parent
5718bba1b1
commit
39e3d1456f
@ -1643,6 +1643,7 @@ if test "$llvm_cv_os_type" = "MingW" ; then
|
||||
AC_CHECK_LIB(ole32, main)
|
||||
AC_CHECK_LIB(psapi, main)
|
||||
AC_CHECK_LIB(shell32, main)
|
||||
AC_CHECK_LIB(uuid,main)
|
||||
fi
|
||||
|
||||
dnl dlopen() is required for plugin support.
|
||||
@ -2241,3 +2242,14 @@ AC_CONFIG_MAKEFILE(bindings/ocaml/Makefile.ocaml)
|
||||
|
||||
dnl Finally, crank out the output
|
||||
AC_OUTPUT
|
||||
echo ""
|
||||
echo ""
|
||||
echo "################################################################################"
|
||||
echo "################################################################################"
|
||||
echo "The LLVM project has deprecated building with configure & make."
|
||||
echo "The autoconf-based makefile build system will be removed in the 3.9 release."
|
||||
echo ""
|
||||
echo "Please migrate to the CMake-based build system."
|
||||
echo "For more information see: http://llvm.org/docs/CMake.html"
|
||||
echo "################################################################################"
|
||||
echo "################################################################################"
|
||||
|
82
configure
vendored
82
configure
vendored
@ -8900,6 +8900,87 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for main in -luuid" >&5
|
||||
echo $ECHO_N "checking for main in -luuid... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_uuid_main+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-luuid $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return main ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||
if { (ac_try="$ac_link"
|
||||
case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_link") 2>conftest.er1
|
||||
ac_status=$?
|
||||
grep -v '^ *+' conftest.er1 >conftest.err
|
||||
rm -f conftest.er1
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
|
||||
{ (case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_try") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; } &&
|
||||
{ ac_try='test -s conftest$ac_exeext'
|
||||
{ (case "(($ac_try" in
|
||||
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||||
*) ac_try_echo=$ac_try;;
|
||||
esac
|
||||
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||||
(eval "$ac_try") 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
ac_cv_lib_uuid_main=yes
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
ac_cv_lib_uuid_main=no
|
||||
fi
|
||||
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_main" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_uuid_main" >&6; }
|
||||
if test $ac_cv_lib_uuid_main = yes; then
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define HAVE_LIBUUID 1
|
||||
_ACEOF
|
||||
|
||||
LIBS="-luuid $LIBS"
|
||||
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for library containing dlopen" >&5
|
||||
@ -19394,4 +19475,3 @@ echo "Please migrate to the CMake-based build system."
|
||||
echo "For more information see: http://llvm.org/docs/CMake.html"
|
||||
echo "################################################################################"
|
||||
echo "################################################################################"
|
||||
|
||||
|
@ -152,6 +152,9 @@
|
||||
/* Define to 1 if you have the `shell32' library (-lshell32). */
|
||||
#undef HAVE_LIBSHELL32
|
||||
|
||||
/* Define to 1 if you have the `uuid' library (-luuid). */
|
||||
#undef HAVE_LIBUUID
|
||||
|
||||
/* Define to 1 if you have the `z' library (-lz). */
|
||||
#undef HAVE_LIBZ
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user