From 4e5541352cd582c7c7320d02c075cf7a95c6bfda Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Thu, 14 Mar 2024 00:05:38 -0500 Subject: [PATCH v1 2/2] Remove some unused variables in Meson They weren't being used, so don't assign to them. --- meson.build | 5 ----- src/backend/meson.build | 1 - 2 files changed, 6 deletions(-) diff --git a/meson.build b/meson.build index 85788f9dd8f..b0a45a7d834 100644 --- a/meson.build +++ b/meson.build @@ -202,7 +202,6 @@ if host_system == 'cygwin' dlsuffix = '.dll' mod_link_args_fmt = ['@0@'] mod_link_with_name = 'lib@0@.exe.a' - mod_link_with_dir = 'libdir' elif host_system == 'darwin' dlsuffix = '.dylib' @@ -212,7 +211,6 @@ elif host_system == 'darwin' export_fmt = '-Wl,-exported_symbols_list,@0@' mod_link_args_fmt = ['-bundle_loader', '@0@'] - mod_link_with_dir = 'bindir' mod_link_with_name = '@0@' sysroot_args = [files('src/tools/darwin_sysroot'), get_option('darwin_sysroot')] @@ -269,7 +267,6 @@ elif host_system == 'windows' mod_link_with_name = 'lib@0@.exe.a' endif mod_link_args_fmt = ['@0@'] - mod_link_with_dir = 'libdir' shmem_kind = 'win32' sema_kind = 'win32' @@ -488,10 +485,8 @@ dir_pgxs = dir_lib_pkg / 'pgxs' dir_include = get_option('includedir') dir_include_pkg = dir_include -dir_include_pkg_rel = '' if not (dir_prefix_contains_pg or dir_include_pkg.contains('pgsql') or dir_include_pkg.contains('postgres')) dir_include_pkg = dir_include_pkg / pkg - dir_include_pkg_rel = pkg endif dir_man = get_option('mandir') diff --git a/src/backend/meson.build b/src/backend/meson.build index 436c04af080..d2c10d1abd7 100644 --- a/src/backend/meson.build +++ b/src/backend/meson.build @@ -154,7 +154,6 @@ if mod_link_args_fmt.length() > 0 name = mod_link_with_name.format('postgres') link_with_uninst = meson.current_build_dir() / name - link_with_inst = '${@0@}/@1@'.format(mod_link_with_dir, name) foreach el : mod_link_args_fmt pg_mod_link_args += el.format(link_with_uninst) -- Tristan Partin Neon (https://neon.tech)