Sfoglia il codice sorgente

meson: Move bsd_user_ss to bsd-user/

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>
Richard Henderson 3 anni fa
parent
commit
3363615a65
2 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 4 0
      bsd-user/meson.build
  2. 0 3
      meson.build

+ 4 - 0
bsd-user/meson.build

@@ -2,6 +2,8 @@ if not have_bsd_user
    subdir_done()
    subdir_done()
 endif
 endif
 
 
+bsd_user_ss = ss.source_set()
+
 common_user_inc += include_directories('.')
 common_user_inc += include_directories('.')
 
 
 bsd_user_ss.add(files(
 bsd_user_ss.add(files(
@@ -17,3 +19,5 @@ bsd_user_ss.add(files(
 
 
 # Pull in the OS-specific build glue, if any
 # Pull in the OS-specific build glue, if any
 subdir(targetos)
 subdir(targetos)
+
+specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss)

+ 0 - 3
meson.build

@@ -2375,7 +2375,6 @@ genh += hxdep
 authz_ss = ss.source_set()
 authz_ss = ss.source_set()
 blockdev_ss = ss.source_set()
 blockdev_ss = ss.source_set()
 block_ss = ss.source_set()
 block_ss = ss.source_set()
-bsd_user_ss = ss.source_set()
 chardev_ss = ss.source_set()
 chardev_ss = ss.source_set()
 common_ss = ss.source_set()
 common_ss = ss.source_set()
 common_user_ss = ss.source_set()
 common_user_ss = ss.source_set()
@@ -2630,8 +2629,6 @@ subdir('common-user')
 subdir('bsd-user')
 subdir('bsd-user')
 subdir('linux-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_ss = common_user_ss.apply(config_all, strict: false)
 common_user = static_library('common-user',
 common_user = static_library('common-user',
                              sources: common_user_ss.sources(),
                              sources: common_user_ss.sources(),