[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/15] meson: Move bsd_user_ss to bsd-user/
From: |
Richard Henderson |
Subject: |
[PULL 15/15] meson: Move bsd_user_ss to bsd-user/ |
Date: |
Mon, 20 Dec 2021 12:25:00 -0800 |
We have no need to reference bsd_user_ss outside of bsd-user.
Go ahead and merge it directly into specific_ss.
Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
meson.build | 3 ---
bsd-user/meson.build | 4 ++++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index cc4df68b20..f45ecf31bd 100644
--- a/meson.build
+++ b/meson.build
@@ -2375,7 +2375,6 @@ genh += hxdep
authz_ss = ss.source_set()
blockdev_ss = ss.source_set()
block_ss = ss.source_set()
-bsd_user_ss = ss.source_set()
chardev_ss = ss.source_set()
common_ss = ss.source_set()
common_user_ss = ss.source_set()
@@ -2630,8 +2629,6 @@ subdir('common-user')
subdir('bsd-user')
subdir('linux-user')
-specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
-
common_user_ss = common_user_ss.apply(config_all, strict: false)
common_user = static_library('common-user',
sources: common_user_ss.sources(),
diff --git a/bsd-user/meson.build b/bsd-user/meson.build
index 25c3976ead..9fcb80c3fa 100644
--- a/bsd-user/meson.build
+++ b/bsd-user/meson.build
@@ -2,6 +2,8 @@ if not have_bsd_user
subdir_done()
endif
+bsd_user_ss = ss.source_set()
+
common_user_inc += include_directories('.')
bsd_user_ss.add(files(
@@ -17,3 +19,5 @@ bsd_user_ss.add(files(
# Pull in the OS-specific build glue, if any
subdir(targetos)
+
+specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)
--
2.25.1
- [PULL 04/15] linux-user/host/sparc64: Add safe-syscall.inc.S, (continued)
- [PULL 04/15] linux-user/host/sparc64: Add safe-syscall.inc.S, Richard Henderson, 2021/12/20
- [PULL 02/15] linux-user: Move syscall error detection into safe_syscall_base, Richard Henderson, 2021/12/20
- [PULL 01/15] linux-user: Untabify all safe-syscall.inc.S, Richard Henderson, 2021/12/20
- [PULL 10/15] bsd-user: Create special-errno.h, Richard Henderson, 2021/12/20
- [PULL 14/15] meson: Move linux_user_ss to linux-user/, Richard Henderson, 2021/12/20
- [PULL 07/15] bsd-user: Rename TARGET_ERESTARTSYS to QEMU_ERESTARTSYS, Richard Henderson, 2021/12/20
- [PULL 03/15] linux-user/host/mips: Add safe-syscall.inc.S, Richard Henderson, 2021/12/20
- [PULL 12/15] common-user: Adjust system call return on FreeBSD, Richard Henderson, 2021/12/20
- [PULL 05/15] linux-user: Remove HAVE_SAFE_SYSCALL and hostdep.h, Richard Henderson, 2021/12/20
- [PULL 09/15] linux-user: Create special-errno.h, Richard Henderson, 2021/12/20
- [PULL 15/15] meson: Move bsd_user_ss to bsd-user/,
Richard Henderson <=
- [PULL 08/15] linux-user: Rename TARGET_QEMU_ESIGRETURN to QEMU_ESIGRETURN, Richard Henderson, 2021/12/20
- [PULL 13/15] linux-user: Move thunk.c from top-level, Richard Henderson, 2021/12/20
- [PULL 11/15] common-user: Move safe-syscall.* from linux-user, Richard Henderson, 2021/12/20
- [PULL 06/15] linux-user: Rename TARGET_ERESTARTSYS to QEMU_ERESTARTSYS, Richard Henderson, 2021/12/20
- Re: [PULL 00/15] *-user: simplify safe signal handling, Richard Henderson, 2021/12/20