diff options
| author | Peter Eisentraut <peter@eisentraut.org> | 2024-01-23 12:15:21 +0100 |
|---|---|---|
| committer | Peter Eisentraut <peter@eisentraut.org> | 2024-01-23 12:16:37 +0100 |
| commit | 4b4b3467ee36d11b6bf791731532ab962b0379be (patch) | |
| tree | 67af4f117d540b099a333fb71479c99875f47aaa | |
| parent | 21ef4d4d897563adb2f7920ad53b734950f1e0a4 (diff) | |
| download | postgresql-4b4b3467ee36d11b6bf791731532ab962b0379be.tar.gz postgresql-4b4b3467ee36d11b6bf791731532ab962b0379be.zip | |
meson: portname was set too early
portname is set to host_system, but host_system might still be changed
later in the file. As a consequence, platforms where host_system is
changed later wouldn't find some of their platform-specific files
(driven by portname), and the build would fail. Move the assignment
of portname further down after the last change of host_system (but
before further overriding assignments to portname).
Discussion: https://www.postgresql.org/message-id/flat/CAC7zN94TdsHhY88XkroJzSMx7E%3DBQpV9LKKjNSEnTM04ihoWCA%40mail.gmail.com
| -rw-r--r-- | meson.build | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meson.build b/meson.build index 55184db2488..a0c0914b509 100644 --- a/meson.build +++ b/meson.build @@ -159,12 +159,6 @@ cdata.set_quoted('CONFIGURE_ARGS', '') # Basic platform specific configuration ############################################################### -# meson's system names don't quite map to our "traditional" names. In some -# places we need the "traditional" name, e.g., for mapping -# src/include/port/$os.h to src/include/pg_config_os.h. Define portname for -# that purpose. -portname = host_system - exesuffix = '' # overridden below where necessary dlsuffix = '.so' # overridden below where necessary library_path_var = 'LD_LIBRARY_PATH' @@ -192,6 +186,12 @@ if host_system == 'dragonfly' host_system = 'netbsd' endif +# meson's system names don't quite map to our "traditional" names. In some +# places we need the "traditional" name, e.g., for mapping +# src/include/port/$os.h to src/include/pg_config_os.h. Define portname for +# that purpose. +portname = host_system + if host_system == 'aix' library_path_var = 'LIBPATH' |