mirror of
https://github.com/postgres/postgres.git
synced 2025-12-10 14:22:35 +03:00
Select CFLAGS_SL at configure time, not in platform-specific Makefiles.
Move the platform-dependent logic that sets CFLAGS_SL from src/makefiles/Makefile.foo to src/template/foo, so that the value is determined at configure time and thus is available while running configure's tests. On a couple of platforms this might save a few microseconds of build time by eliminating a test that make otherwise has to do over and over. Otherwise it's pretty much a wash for build purposes; in particular, this makes no difference to anyone who might be overriding CFLAGS_SL via a make option. This patch in itself does nothing with the value and thus should not change any behavior, though you'll probably have to re-run configure to get a correctly updated Makefile.global. We'll use the new configure variable in a follow-on patch. Per gripe from Kyotaro Horiguchi. Back-patch to all supported branches, because the follow-on patch is a portability bug fix. Discussion: https://postgr.es/m/20191010.144533.263180400.horikyota.ntt@gmail.com
This commit is contained in:
@@ -12,7 +12,6 @@ LIBS:=$(filter-out -lm -lc, $(LIBS))
|
||||
|
||||
AROPT = crs
|
||||
DLSUFFIX = .dll
|
||||
CFLAGS_SL =
|
||||
|
||||
override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
|
||||
|
||||
|
||||
@@ -7,8 +7,6 @@ endif
|
||||
|
||||
DLSUFFIX = .so
|
||||
|
||||
CFLAGS_SL = -fPIC -DPIC
|
||||
|
||||
# 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
|
||||
|
||||
@@ -30,11 +30,6 @@ ifeq ($(host_cpu), ia64)
|
||||
else
|
||||
DLSUFFIX = .sl
|
||||
endif
|
||||
ifeq ($(GCC), yes)
|
||||
CFLAGS_SL = -fPIC
|
||||
else
|
||||
CFLAGS_SL = +Z
|
||||
endif
|
||||
|
||||
# env var name to use in place of LD_LIBRARY_PATH
|
||||
ld_library_path_var = SHLIB_PATH
|
||||
|
||||
@@ -7,8 +7,6 @@ rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
|
||||
|
||||
DLSUFFIX = .so
|
||||
|
||||
CFLAGS_SL = -fPIC
|
||||
|
||||
|
||||
# Rule for building a shared library from a single .o file
|
||||
%.so: %.o
|
||||
|
||||
@@ -9,8 +9,6 @@ endif
|
||||
|
||||
DLSUFFIX = .so
|
||||
|
||||
CFLAGS_SL = -fPIC -DPIC
|
||||
|
||||
|
||||
# Rule for building a shared library from a single .o file
|
||||
%.so: %.o
|
||||
|
||||
@@ -7,8 +7,6 @@ endif
|
||||
|
||||
DLSUFFIX = .so
|
||||
|
||||
CFLAGS_SL = -fPIC -DPIC
|
||||
|
||||
|
||||
# Rule for building a shared library from a single .o file
|
||||
%.so: %.o
|
||||
|
||||
@@ -2,11 +2,7 @@ AROPT = cr
|
||||
export_dynamic = -Wl,-Bexport
|
||||
|
||||
DLSUFFIX = .so
|
||||
ifeq ($(GCC), yes)
|
||||
CFLAGS_SL = -fpic
|
||||
else
|
||||
CFLAGS_SL = -K PIC
|
||||
endif
|
||||
|
||||
|
||||
# Rule for building a shared library from a single .o file
|
||||
%.so: %.o
|
||||
|
||||
@@ -10,11 +10,7 @@ rpath = -Wl,-R'$(rpathdir)'
|
||||
endif
|
||||
|
||||
DLSUFFIX = .so
|
||||
ifeq ($(GCC), yes)
|
||||
CFLAGS_SL = -fPIC
|
||||
else
|
||||
CFLAGS_SL = -KPIC
|
||||
endif
|
||||
|
||||
|
||||
# Rule for building a shared library from a single .o file
|
||||
%.so: %.o
|
||||
|
||||
@@ -17,11 +17,7 @@ endif
|
||||
CFLAGS += $(PTHREAD_CFLAGS)
|
||||
|
||||
DLSUFFIX = .so
|
||||
ifeq ($(GCC), yes)
|
||||
CFLAGS_SL = -fpic
|
||||
else
|
||||
CFLAGS_SL = -K PIC
|
||||
endif
|
||||
|
||||
ifeq ($(GCC), yes)
|
||||
SO_FLAGS = -shared
|
||||
else
|
||||
|
||||
@@ -12,7 +12,6 @@ override CPPFLAGS += -DWIN32_STACK_RLIMIT=$(WIN32_STACK_RLIMIT)
|
||||
|
||||
AROPT = crs
|
||||
DLSUFFIX = .dll
|
||||
CFLAGS_SL =
|
||||
|
||||
ifneq (,$(findstring backend,$(subdir)))
|
||||
ifeq (,$(findstring conversion_procs,$(subdir)))
|
||||
|
||||
Reference in New Issue
Block a user