diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2022-02-09 09:50:07 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2022-02-09 12:47:32 +1000 |
| commit | ad8de302874ab2075928ddd4e3f762251fef0703 (patch) | |
| tree | ec3495639e914ca8d90ffa2331008e4cb025045e | |
| parent | 291192a5e5ac329cc5d355858d6e69337c65be1d (diff) | |
| download | xf86-input-wacom-ad8de302874ab2075928ddd4e3f762251fef0703.tar.gz | |
Drop the build system checks for -wrap
No longer needed as of ff94040208c9da3411753e1ffe554e6c80b87dd7
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | meson.build | 14 |
2 files changed, 1 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index ba569b9..843c02e 100644 --- a/configure.ac +++ b/configure.ac @@ -136,24 +136,6 @@ AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests], # If unittests aren't explicitly disabled, check for required support if test "x$UNITTESTS" != xno ; then - # Check if linker supports -wrap, passed via compiler flags - # When cross-compiling, reports no, since unit tests run from - # "make check", so would be running on build machine, not target - AC_MSG_CHECKING([whether the linker supports -wrap]) - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,-wrap,exit" - AC_RUN_IFELSE([AC_LANG_PROGRAM([[ - void __wrap_exit (int s) - { - __real_exit (0); - }]], - [[exit (1);]])], - [linker_can_wrap="yes"], - [linker_can_wrap="no"], - [linker_can_wrap="no"]) - AC_MSG_RESULT([$linker_can_wrap]) - LDFLAGS="$save_LDFLAGS" - # Check for the availability of dlsym and friends AC_CHECK_LIB([dl], [dlsym], [libdl_available="yes"], diff --git a/meson.build b/meson.build index ef6c816..8610a67 100644 --- a/meson.build +++ b/meson.build @@ -307,19 +307,7 @@ if get_option('serial-device-support') endif # Tests -have_wrap = cc.links(''' -void __wrap_exit (int s) { - __real_exit (0); -} -int main(void) { - exit(1); -}''', -args: '-Wl,-wrap,exit') - -if get_option('unittests').enabled() and not have_wrap - error('ld -wrap support required to build unit tests') -endif -build_unittests = have_wrap and not get_option('unittests').disabled() +build_unittests = not get_option('unittests').disabled() if build_unittests xsetwacom_test = executable( |