diff options
| author | Peter Eisentraut | 2022-03-25 07:44:31 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2022-03-25 07:56:02 +0000 |
| commit | 23119d51a14c046dae35ae5e6ad9e35982d044fd (patch) | |
| tree | 890a141660b21c60d9f6e2fc8efd7944a55673a9 /src/backend | |
| parent | 56566835039ac5eed70f188518cef1a7ea0971b2 (diff) | |
Refactor DLSUFFIX handling
Move DLSUFFIX from makefiles into header files for all platforms.
Move the DLSUFFIX assignment from src/makefiles/ to src/templates/,
have configure read it, and then substitute it into Makefile.global
and pg_config.h. This avoids the need for all makefile rules that
need it to locally set CPPFLAGS. It also resolves an inconsistent
setup between the two Windows build systems.
Reviewed-by: Andres Freund <andres@anarazel.de>
Discussion: https://www.postgresql.org/message-id/2f9861fb-8969-9005-7518-b8e60f2bead9@enterprisedb.com
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/jit/Makefile | 2 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/Makefile | 2 | ||||
| -rw-r--r-- | src/backend/utils/fmgr/dfmgr.c | 5 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/backend/jit/Makefile b/src/backend/jit/Makefile index a895ebac5fb..a9a603e6392 100644 --- a/src/backend/jit/Makefile +++ b/src/backend/jit/Makefile @@ -15,8 +15,6 @@ subdir = src/backend/jit top_builddir = ../../.. include $(top_builddir)/src/Makefile.global -override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\" - OBJS = \ jit.o diff --git a/src/backend/utils/fmgr/Makefile b/src/backend/utils/fmgr/Makefile index f552b95ca99..ceffb807fbb 100644 --- a/src/backend/utils/fmgr/Makefile +++ b/src/backend/utils/fmgr/Makefile @@ -17,6 +17,4 @@ OBJS = \ fmgr.o \ funcapi.o -override CPPFLAGS += -DDLSUFFIX=\"$(DLSUFFIX)\" - include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c index 050da780804..3774f33e0e9 100644 --- a/src/backend/utils/fmgr/dfmgr.c +++ b/src/backend/utils/fmgr/dfmgr.c @@ -483,11 +483,6 @@ file_exists(const char *name) } -/* Example format: ".so" */ -#ifndef DLSUFFIX -#error "DLSUFFIX must be defined to compile this file." -#endif - /* * If name contains a slash, check if the file exists, if so return * the name. Else (no slash) try to expand using search path (see |