[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9dc26d4: Only attempt to generate seccomp filter files on x86-64
From: |
Philipp Stephani |
Subject: |
master 9dc26d4: Only attempt to generate seccomp filter files on x86-64 systems. |
Date: |
Sun, 11 Apr 2021 10:26:40 -0400 (EDT) |
branch: master
commit 9dc26d4a8add5b3f2a5fce7907af4f9673ae82c0
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>
Only attempt to generate seccomp filter files on x86-64 systems.
The seccomp filters are always architecture-specific, and
seccomp-filter.c right now only supports x86-64.
* lib-src/Makefile.in (SECCOMP_FILTER): New variable.
(DONT_INSTALL, all, seccomp-filter$(EXEEXT)): Use it.
---
lib-src/Makefile.in | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 1942882..5870286 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -191,7 +191,14 @@ LIBS_ETAGS = $(LIB_CLOCK_GETTIME) $(LIB_GETRANDOM)
LIBSECCOMP=@LIBSECCOMP@
+# Currently, we can only generate seccomp filter files for x86-64.
ifneq ($(LIBSECCOMP),)
+ifeq ($(shell uname -m),x86_64)
+SECCOMP_FILTER=1
+endif
+endif
+
+ifeq ($(SECCOMP_FILTER),1)
DONT_INSTALL += seccomp-filter$(EXEEXT)
endif
@@ -224,7 +231,7 @@ config_h = ../src/config.h $(srcdir)/../src/conf_post.h
all: ${EXE_FILES} ${SCRIPTS}
-ifneq ($(LIBSECCOMP),)
+ifeq ($(SECCOMP_FILTER),1)
all: seccomp-filter.bpf
endif
@@ -410,7 +417,7 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c
$(NTLIB) $(config_h)
emacsclient.res: ../nt/emacsclient.rc $(NTINC)/../icons/emacs.ico
$(AM_V_RC)$(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $<
-ifneq ($(LIBSECCOMP),)
+ifeq ($(SECCOMP_FILTER),1)
seccomp-filter$(EXEEXT): $(srcdir)/seccomp-filter.c $(config_h)
$(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $< $(LIBSECCOMP) -o $@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 9dc26d4: Only attempt to generate seccomp filter files on x86-64 systems.,
Philipp Stephani <=