Skip to content

Commit 1763cf1

Browse files
Ericson2314mergify[bot]
authored andcommitted
Fix a bunch of missing meson boilerplate
These other libraries need this too (cherry picked from commit ffdce51)
1 parent 6f3dd65 commit 1763cf1

File tree

5 files changed

+25
-0
lines changed

5 files changed

+25
-0
lines changed

src/libcmd/meson.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,15 @@ headers = [config_h] + files(
113113
'repl.hh',
114114
)
115115

116+
subdir('nix-meson-build-support/export-all-symbols')
117+
subdir('nix-meson-build-support/windows-version')
118+
116119
this_library = library(
117120
'nixcmd',
118121
sources,
119122
dependencies : deps_public + deps_private + deps_other,
123+
include_directories : include_dirs,
124+
link_args: linker_export_flags,
120125
prelink : true, # For C++ static initializers
121126
install : true,
122127
)

src/libexpr/meson.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,18 @@ headers = [config_h] + files(
187187

188188
subdir('primops')
189189

190+
subdir('nix-meson-build-support/export-all-symbols')
191+
subdir('nix-meson-build-support/windows-version')
192+
190193
this_library = library(
191194
'nixexpr',
192195
sources,
193196
parser_tab,
194197
lexer_tab,
195198
generated_headers,
196199
dependencies : deps_public + deps_private + deps_other,
200+
include_directories : include_dirs,
201+
link_args: linker_export_flags,
197202
prelink : true, # For C++ static initializers
198203
install : true,
199204
)

src/libfetchers/meson.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,15 @@ headers = files(
7676
'tarball.hh',
7777
)
7878

79+
subdir('nix-meson-build-support/export-all-symbols')
80+
subdir('nix-meson-build-support/windows-version')
81+
7982
this_library = library(
8083
'nixfetchers',
8184
sources,
8285
dependencies : deps_public + deps_private + deps_other,
86+
include_directories : include_dirs,
87+
link_args: linker_export_flags,
8388
prelink : true, # For C++ static initializers
8489
install : true,
8590
)

src/libflake/meson.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,15 @@ headers = files(
5858
'flake/url-name.hh',
5959
)
6060

61+
subdir('nix-meson-build-support/export-all-symbols')
62+
subdir('nix-meson-build-support/windows-version')
63+
6164
this_library = library(
6265
'nixflake',
6366
sources,
6467
dependencies : deps_public + deps_private + deps_other,
68+
include_directories : include_dirs,
69+
link_args: linker_export_flags,
6570
prelink : true, # For C++ static initializers
6671
install : true,
6772
)

src/libmain/meson.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,15 @@ headers = [config_h] + files(
8282
'shared.hh',
8383
)
8484

85+
subdir('nix-meson-build-support/export-all-symbols')
86+
subdir('nix-meson-build-support/windows-version')
87+
8588
this_library = library(
8689
'nixmain',
8790
sources,
8891
dependencies : deps_public + deps_private + deps_other,
92+
include_directories : include_dirs,
93+
link_args: linker_export_flags,
8994
prelink : true, # For C++ static initializers
9095
install : true,
9196
)

0 commit comments

Comments
 (0)