database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-27 12:41:57 +03:00
Code Activity

Refactor DLSUFFIX handling

Browse Source 
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
This commit is contained in:
Peter Eisentraut
2022-03-25 08:44:31 +01:00
parent 5656683503
commit 23119d51a1
26 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/makefiles/Makefile.aix
View File

@ -14,7 +14,6 @@ else
rpath = -Wl,-blibpath:'$(rpathdir)$(libpath)'
endif
DLSUFFIX = .so
ifeq ($(host_os), aix3.2.5)
ifneq ($(GCC), yes)
LDFLAGS_SL += -e _nostart -H512 -bM:SRE

1
src/makefiles/Makefile.cygwin
View File

@ -11,7 +11,6 @@ endif
LIBS:=$(filter-out -lm -lc, $(LIBS))
AROPT = crs
DLSUFFIX = .dll
override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)

2
src/makefiles/Makefile.darwin
View File

@ -1,7 +1,5 @@
AROPT = crs
DLSUFFIX = .so
# env var name to use in place of LD_LIBRARY_PATH
ld_library_path_var = DYLD_LIBRARY_PATH

2
src/makefiles/Makefile.freebsd
View File

@ -3,8 +3,6 @@ AROPT = cr
export_dynamic = -Wl,-export-dynamic
rpath = -Wl,-R'$(rpathdir)'
DLSUFFIX = .so
# extra stuff for $(with_temp_install)
# we need this to get LD_LIBRARY_PATH searched ahead of the compiled-in
# rpath, if no DT_RUNPATH is present in the executable. The conditions

6
src/makefiles/Makefile.hpux
View File

@ -25,12 +25,6 @@ INSTALL_SHLIB_OPTS = -m 555
AROPT = crs
ifeq ($(host_cpu), ia64)
DLSUFFIX = .so
else
DLSUFFIX = .sl
endif
# env var name to use in place of LD_LIBRARY_PATH
ld_library_path_var = SHLIB_PATH

2
src/makefiles/Makefile.linux
View File

@ -5,8 +5,6 @@ export_dynamic = -Wl,-E
# This allows LD_LIBRARY_PATH to still work when needed.
rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
DLSUFFIX = .so
# Rule for building a shared library from a single .o file
%.so: %.o

2
src/makefiles/Makefile.netbsd
View File

@ -3,8 +3,6 @@ AROPT = cr
export_dynamic = -Wl,-E
rpath = -Wl,-R'$(rpathdir)'
DLSUFFIX = .so
# Rule for building a shared library from a single .o file
%.so: %.o

2
src/makefiles/Makefile.openbsd
View File

@ -3,8 +3,6 @@ AROPT = cr
export_dynamic = -Wl,-E
rpath = -Wl,-R'$(rpathdir)'
DLSUFFIX = .so
# Rule for building a shared library from a single .o file
%.so: %.o

2
src/makefiles/Makefile.solaris
View File

@ -9,8 +9,6 @@ else
rpath = -Wl,-R'$(rpathdir)'
endif
DLSUFFIX = .so
# Rule for building a shared library from a single .o file
%.so: %.o

1
src/makefiles/Makefile.win32
View File

@ -11,7 +11,6 @@ endif
override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
AROPT = crs
DLSUFFIX = .dll
ifneq (,$(findstring backend,$(subdir)))
ifeq (,$(findstring conversion_procs,$(subdir)))