diff options
| author | Stefan Kangas <stefan@marxist.se> | 2022-07-16 06:30:39 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2022-07-16 06:30:39 +0200 |
| commit | 9699eaf8af0e9e79e9b4ebd51e23ab81ec90903c (patch) | |
| tree | f71eba14cf4890308444b86cb69181b71b450eb2 /lib-src | |
| parent | 00501e82c735d4b0928888fffc2049f8ec2d5ae6 (diff) | |
| parent | db259d8fd369e6036df782d5fe51723a68220074 (diff) | |
| download | emacs-9699eaf8af0e9e79e9b4ebd51e23ab81ec90903c.tar.gz | |
Merge from origin/emacs-28
db259d8fd3 Build Seccomp filter only if we have a 64-bit userspace (B...
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 0453b935068..cf4659fc2c1 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -210,11 +210,13 @@ HAVE_SECCOMP=@HAVE_SECCOMP@ HAVE_LIBSECCOMP=@HAVE_LIBSECCOMP@ LIBSECCOMP_LIBS=@LIBSECCOMP_LIBS@ LIBSECCOMP_CFLAGS=@LIBSECCOMP_CFLAGS@ +SIZEOF_LONG=@SIZEOF_LONG@ # Currently, we can only generate seccomp filter files for x86-64. ifeq ($(HAVE_SECCOMP),yes) ifeq ($(HAVE_LIBSECCOMP),yes) ifeq ($(shell uname -m),x86_64) +ifeq ($(SIZEOF_LONG),8) # We require SECCOMP_RET_KILL_PROCESS, which is only available in # Linux 4.14 and later. ifeq ($(shell { echo 4.14; uname -r | cut -d . -f 1-2; } | \ @@ -225,6 +227,7 @@ endif endif endif endif +endif ifeq ($(SECCOMP_FILTER),1) DONT_INSTALL += seccomp-filter$(EXEEXT) |