mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2025-01-31 12:41:49 +01:00
Remove the configure and cmake checks for sys/wait.h
If we don't have sys/wait.h and we're on a unix system there's no way that several of the llvm tools work at all. This includes clang. Just remove the configure and cmake checks entirely - we'll get a build error instead of building something broken now. llvm-svn: 243957
This commit is contained in:
parent
0942a1c9ca
commit
59cbd5e6a5
@ -1786,7 +1786,6 @@ dnl Generally we're looking for POSIX headers.
|
|||||||
AC_HEADER_DIRENT
|
AC_HEADER_DIRENT
|
||||||
AC_HEADER_MMAP_ANONYMOUS
|
AC_HEADER_MMAP_ANONYMOUS
|
||||||
AC_HEADER_STAT
|
AC_HEADER_STAT
|
||||||
AC_HEADER_SYS_WAIT
|
|
||||||
AC_HEADER_TIME
|
AC_HEADER_TIME
|
||||||
|
|
||||||
AC_LANG_PUSH([C++])
|
AC_LANG_PUSH([C++])
|
||||||
|
@ -67,7 +67,6 @@ check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H)
|
|||||||
check_include_file(sys/stat.h HAVE_SYS_STAT_H)
|
check_include_file(sys/stat.h HAVE_SYS_STAT_H)
|
||||||
check_include_file(sys/time.h HAVE_SYS_TIME_H)
|
check_include_file(sys/time.h HAVE_SYS_TIME_H)
|
||||||
check_include_file(sys/uio.h HAVE_SYS_UIO_H)
|
check_include_file(sys/uio.h HAVE_SYS_UIO_H)
|
||||||
check_include_file(sys/wait.h HAVE_SYS_WAIT_H)
|
|
||||||
check_include_file(termios.h HAVE_TERMIOS_H)
|
check_include_file(termios.h HAVE_TERMIOS_H)
|
||||||
check_include_file(unistd.h HAVE_UNISTD_H)
|
check_include_file(unistd.h HAVE_UNISTD_H)
|
||||||
check_include_file(utime.h HAVE_UTIME_H)
|
check_include_file(utime.h HAVE_UTIME_H)
|
||||||
|
85
configure
vendored
85
configure
vendored
@ -11124,90 +11124,6 @@ _ACEOF
|
|||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
|
|
||||||
echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
|
|
||||||
if test "${ac_cv_header_sys_wait_h+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
|
||||||
/* confdefs.h. */
|
|
||||||
_ACEOF
|
|
||||||
cat confdefs.h >>conftest.$ac_ext
|
|
||||||
cat >>conftest.$ac_ext <<_ACEOF
|
|
||||||
/* end confdefs.h. */
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/wait.h>
|
|
||||||
#ifndef WEXITSTATUS
|
|
||||||
# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
|
|
||||||
#endif
|
|
||||||
#ifndef WIFEXITED
|
|
||||||
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int
|
|
||||||
main ()
|
|
||||||
{
|
|
||||||
int s;
|
|
||||||
wait (&s);
|
|
||||||
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
|
|
||||||
;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
_ACEOF
|
|
||||||
rm -f conftest.$ac_objext
|
|
||||||
if { (ac_try="$ac_compile"
|
|
||||||
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_compile") 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_objext'
|
|
||||||
{ (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_header_sys_wait_h=yes
|
|
||||||
else
|
|
||||||
echo "$as_me: failed program was:" >&5
|
|
||||||
sed 's/^/| /' conftest.$ac_ext >&5
|
|
||||||
|
|
||||||
ac_cv_header_sys_wait_h=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
|
||||||
fi
|
|
||||||
{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
|
|
||||||
echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
|
|
||||||
if test $ac_cv_header_sys_wait_h = yes; then
|
|
||||||
|
|
||||||
cat >>confdefs.h <<\_ACEOF
|
|
||||||
#define HAVE_SYS_WAIT_H 1
|
|
||||||
_ACEOF
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
|
{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
|
||||||
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
|
echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
|
||||||
if test "${ac_cv_header_time+set}" = set; then
|
if test "${ac_cv_header_time+set}" = set; then
|
||||||
@ -19793,4 +19709,3 @@ echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;}
|
|||||||
cd "$ac_popdir"
|
cd "$ac_popdir"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -324,9 +324,6 @@
|
|||||||
/* Define to 1 if you have the <sys/uio.h> header file. */
|
/* Define to 1 if you have the <sys/uio.h> header file. */
|
||||||
#cmakedefine HAVE_SYS_UIO_H ${HAVE_SYS_UIO_H}
|
#cmakedefine HAVE_SYS_UIO_H ${HAVE_SYS_UIO_H}
|
||||||
|
|
||||||
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
|
|
||||||
#cmakedefine HAVE_SYS_WAIT_H ${HAVE_SYS_WAIT_H}
|
|
||||||
|
|
||||||
/* Define if the setupterm() function is supported this platform. */
|
/* Define if the setupterm() function is supported this platform. */
|
||||||
#cmakedefine HAVE_TERMINFO ${HAVE_TERMINFO}
|
#cmakedefine HAVE_TERMINFO ${HAVE_TERMINFO}
|
||||||
|
|
||||||
|
@ -318,9 +318,6 @@
|
|||||||
/* Define to 1 if you have the <sys/uio.h> header file. */
|
/* Define to 1 if you have the <sys/uio.h> header file. */
|
||||||
#undef HAVE_SYS_UIO_H
|
#undef HAVE_SYS_UIO_H
|
||||||
|
|
||||||
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
|
|
||||||
#undef HAVE_SYS_WAIT_H
|
|
||||||
|
|
||||||
/* Define if the setupterm() function is supported this platform. */
|
/* Define if the setupterm() function is supported this platform. */
|
||||||
#undef HAVE_TERMINFO
|
#undef HAVE_TERMINFO
|
||||||
|
|
||||||
|
@ -323,7 +323,6 @@ namespace llvm {
|
|||||||
|
|
||||||
ProcessInfo sys::Wait(const ProcessInfo &PI, unsigned SecondsToWait,
|
ProcessInfo sys::Wait(const ProcessInfo &PI, unsigned SecondsToWait,
|
||||||
bool WaitUntilTerminates, std::string *ErrMsg) {
|
bool WaitUntilTerminates, std::string *ErrMsg) {
|
||||||
#ifdef HAVE_SYS_WAIT_H
|
|
||||||
struct sigaction Act, Old;
|
struct sigaction Act, Old;
|
||||||
assert(PI.Pid && "invalid pid to wait on, process not started?");
|
assert(PI.Pid && "invalid pid to wait on, process not started?");
|
||||||
|
|
||||||
@ -417,12 +416,6 @@ ProcessInfo sys::Wait(const ProcessInfo &PI, unsigned SecondsToWait,
|
|||||||
// signal during execution as opposed to failing to execute.
|
// signal during execution as opposed to failing to execute.
|
||||||
WaitResult.ReturnCode = -2;
|
WaitResult.ReturnCode = -2;
|
||||||
}
|
}
|
||||||
#else
|
|
||||||
if (ErrMsg)
|
|
||||||
*ErrMsg = "Program::Wait is not implemented on this platform yet!";
|
|
||||||
ProcessInfo WaitResult;
|
|
||||||
WaitResult.ReturnCode = -2;
|
|
||||||
#endif
|
|
||||||
return WaitResult;
|
return WaitResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
|
||||||
#ifdef HAVE_UNISTD_H
|
#ifdef HAVE_UNISTD_H
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
@ -43,22 +44,10 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
#ifdef HAVE_SYS_WAIT_H
|
|
||||||
# include <sys/wait.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_DLFCN_H
|
#ifdef HAVE_DLFCN_H
|
||||||
# include <dlfcn.h>
|
# include <dlfcn.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef WEXITSTATUS
|
|
||||||
# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef WIFEXITED
|
|
||||||
# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/// This function builds an error message into \p ErrMsg using the \p prefix
|
/// This function builds an error message into \p ErrMsg using the \p prefix
|
||||||
/// string and the Unix error number given by \p errnum. If errnum is -1, the
|
/// string and the Unix error number given by \p errnum. If errnum is -1, the
|
||||||
/// default then the value of errno is used.
|
/// default then the value of errno is used.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user