diff options
| -rw-r--r-- | src/common/Makefile | 5 | ||||
| -rw-r--r-- | src/common/meson.build | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/common/Makefile b/src/common/Makefile index 3d83299432b..89ef61c52a6 100644 --- a/src/common/Makefile +++ b/src/common/Makefile @@ -102,14 +102,15 @@ endif # A few files are currently only built for frontend, not server. # logging.c is excluded from OBJS_FRONTEND_SHLIB (shared library) as # a matter of policy, because it is not appropriate for general purpose -# libraries such as libpq to report errors directly. +# libraries such as libpq to report errors directly. fe_memutils.c is +# excluded because libpq must not exit() on allocation failure. OBJS_FRONTEND_SHLIB = \ $(OBJS_COMMON) \ - fe_memutils.o \ restricted_token.o \ sprompt.o OBJS_FRONTEND = \ $(OBJS_FRONTEND_SHLIB) \ + fe_memutils.o \ logging.o # foo.o, foo_shlib.o, and foo_srv.o are all built from foo.c diff --git a/src/common/meson.build b/src/common/meson.build index de68e408fa3..1a564e1dce1 100644 --- a/src/common/meson.build +++ b/src/common/meson.build @@ -101,17 +101,18 @@ common_sources_cflags = { # A few files are currently only built for frontend, not server. # logging.c is excluded from OBJS_FRONTEND_SHLIB (shared library) as # a matter of policy, because it is not appropriate for general purpose -# libraries such as libpq to report errors directly. +# libraries such as libpq to report errors directly. fe_memutils.c is +# excluded because libpq must not exit() on allocation failure. common_sources_frontend_shlib = common_sources common_sources_frontend_shlib += files( - 'fe_memutils.c', 'restricted_token.c', 'sprompt.c', ) common_sources_frontend_static = common_sources_frontend_shlib common_sources_frontend_static += files( + 'fe_memutils.c', 'logging.c', ) |