diff options
| author | Andres Freund | 2022-10-07 18:53:39 +0000 |
|---|---|---|
| committer | Andres Freund | 2022-10-07 18:53:39 +0000 |
| commit | 2473cb9ff374dff99437138c144fab6d9f7dfd26 (patch) | |
| tree | f262f82d015d3c4dba373b7fcdca407f25c6269a /src/makefiles | |
| parent | 614a406b4ff1b6f0f84b89fb56dca5175978177d (diff) | |
autoconf: Rely on ar supporting index creation
This way we don't need RANLIB anymore, making it a bit simpler for the meson
build to generate Makefile.global for PGXS compatibility.
FreeBSD, NetBSD, OpenBSD, the only platforms where we didn't use AROPT=crs,
all have supported the 's' option for a long time.
On macOS we ran ranlib after installing a static library. This was added a
long time ago, in 58ad65ec2def. I cannot reproduce an issue in more recent
macOS versions. This is removed now.
Based on discussion with Tom, I left the 'touch' at the end of static
libraries generation, added in 826eff57c4c, in place. While it looks like
current versions of Apple's ar/ranlib don't need it, it was needed not too
long ago.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/20221005200710.luvw5evhwf6clig6@awork3.anarazel.de
Diffstat (limited to 'src/makefiles')
| -rw-r--r-- | src/makefiles/Makefile.aix | 3 | ||||
| -rw-r--r-- | src/makefiles/Makefile.cygwin | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.darwin | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.freebsd | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.linux | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.netbsd | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.openbsd | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.solaris | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.win32 | 2 |
9 files changed, 0 insertions, 19 deletions
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index 56d7f22aff6..dd16a7a0378 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -2,9 +2,6 @@ # symbol names to tell them what to export/import. MAKE_EXPORTS= true -RANLIB= touch -AROPT = crs - # -blibpath must contain ALL directories where we should look for libraries libpath := $(shell echo $(subst -L,:,$(filter -L/%,$(LDFLAGS))) | sed -e's/ //g'):/usr/lib:/lib diff --git a/src/makefiles/Makefile.cygwin b/src/makefiles/Makefile.cygwin index 6afa9a06a1b..77593972638 100644 --- a/src/makefiles/Makefile.cygwin +++ b/src/makefiles/Makefile.cygwin @@ -10,8 +10,6 @@ endif # (see http://sources.redhat.com/cygwin/faq/faq.html#SEC110) LIBS:=$(filter-out -lm -lc, $(LIBS)) -AROPT = crs - override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT) ifneq (,$(findstring backend,$(subdir))) diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin index 45f253a5b43..7095f66e25c 100644 --- a/src/makefiles/Makefile.darwin +++ b/src/makefiles/Makefile.darwin @@ -1,5 +1,3 @@ -AROPT = crs - # env var name to use in place of LD_LIBRARY_PATH ld_library_path_var = DYLD_LIBRARY_PATH diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd index 0e77616b0f9..db74a21568c 100644 --- a/src/makefiles/Makefile.freebsd +++ b/src/makefiles/Makefile.freebsd @@ -1,5 +1,3 @@ -AROPT = cr - export_dynamic = -Wl,-export-dynamic rpath = -Wl,-R'$(rpathdir)' diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux index 1ffec9d1698..5a9451371ab 100644 --- a/src/makefiles/Makefile.linux +++ b/src/makefiles/Makefile.linux @@ -1,5 +1,3 @@ -AROPT = crs - export_dynamic = -Wl,-E # Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH. # This allows LD_LIBRARY_PATH to still work when needed. diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd index 421b735e407..4f8e9ec2521 100644 --- a/src/makefiles/Makefile.netbsd +++ b/src/makefiles/Makefile.netbsd @@ -1,5 +1,3 @@ -AROPT = cr - export_dynamic = -Wl,-E rpath = -Wl,-R'$(rpathdir)' diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd index 421b735e407..4f8e9ec2521 100644 --- a/src/makefiles/Makefile.openbsd +++ b/src/makefiles/Makefile.openbsd @@ -1,5 +1,3 @@ -AROPT = cr - export_dynamic = -Wl,-E rpath = -Wl,-R'$(rpathdir)' diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris index acdf44cc0f2..3de73ebc010 100644 --- a/src/makefiles/Makefile.solaris +++ b/src/makefiles/Makefile.solaris @@ -1,6 +1,4 @@ # src/makefiles/Makefile.solaris - -AROPT = crs rpath = -Wl,-rpath,'$(rpathdir)' ifeq ($(with_gnu_ld), yes) diff --git a/src/makefiles/Makefile.win32 b/src/makefiles/Makefile.win32 index d268b3ebafd..dc1aafa115a 100644 --- a/src/makefiles/Makefile.win32 +++ b/src/makefiles/Makefile.win32 @@ -10,8 +10,6 @@ endif override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT) -AROPT = crs - ifneq (,$(findstring backend,$(subdir))) ifeq (,$(findstring conversion_procs,$(subdir))) ifeq (,$(findstring libpqwalreceiver,$(subdir))) |
