mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 07:05:13 +00:00
f2cfc158b2
Do not set FUSERMOUNT_DIR since we already set it though NIX_CFLAGS_COMPILE. Setting it twice results in a lot of warnings like this one: <command-line>:0:0: warning: "FUSERMOUNT_DIR" redefined which makes the build look potentially broken. This doesn't affect the result but fuse3 will now build without any warnings and building fuse yields less warnings.
13 lines
654 B
Diff
13 lines
654 B
Diff
--- a/lib/meson.build
|
|
+++ b/lib/meson.build
|
|
@@ -36,8 +36,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
|
|
soversion: '3', include_directories: include_dirs,
|
|
dependencies: deps, install: true,
|
|
link_depends: 'fuse_versionscript',
|
|
- c_args: [ '-DFUSE_USE_VERSION=34',
|
|
- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
|
|
+ c_args: [ '-DFUSE_USE_VERSION=34' ],
|
|
link_args: ['-Wl,--version-script,' + meson.current_source_dir()
|
|
+ '/fuse_versionscript' ])
|
|
|