summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2019-10-21 12:32:35 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2019-10-21 12:32:35 -0400
commit44273ce4f664a1bb34ef8ea9359237344cd6aaec (patch)
treecd524c164b5b043cb21207992ed454aaacade4de /configure
parent80831bcdbe80a6ca7f22105e32c2cbb54e125c4c (diff)
downloadpostgresql-44273ce4f664a1bb34ef8ea9359237344cd6aaec.tar.gz
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 02a905bfb5..1d664a42d7 100755
--- a/configure
+++ b/configure
@@ -728,6 +728,7 @@ autodepend
TAS
GCC
CPP
+CFLAGS_SL
BITCODE_CXXFLAGS
BITCODE_CFLAGS
CFLAGS_VECTOR
@@ -6579,7 +6580,6 @@ fi
fi
-CFLAGS_VECTOR=$CFLAGS_VECTOR
# Determine flags used to emit bitcode for JIT inlining. Need to test
@@ -6899,9 +6899,10 @@ CXXFLAGS="$CXXFLAGS $user_CXXFLAGS"
BITCODE_CFLAGS="$BITCODE_CFLAGS $user_BITCODE_CFLAGS"
BITCODE_CXXFLAGS="$BITCODE_CXXFLAGS $user_BITCODE_CXXFLAGS"
-BITCODE_CFLAGS=$BITCODE_CFLAGS
-BITCODE_CXXFLAGS=$BITCODE_CXXFLAGS
+
+
+# The template file must set up CFLAGS_SL; we don't support user override
# Check if the compiler still works with the final flag settings