rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: Include CFLAGS/c_args in summary and pg_config output 

Previously arguments passed in via CFLAGS/-Dc_args were neither displayed in
meson's summary, nor in pg_config's output.

Reported-by: "wangw.fnst@fujitsu.com" <wangw.fnst@fujitsu.com>
Discussion: https://postgr.es/m/OS3PR01MB62751847BC9CD2DB7B29AC129E529@OS3PR01MB6275.jpnprd01.prod.outlook.com
This commit is contained in:
Andres Freund 2022-09-26 19:36:24 -07:00
parent 78fdb1e50f
commit 1330dcdec0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -2966,6 +2966,9 @@ if meson.version().version_compare('>=0.57')
'CPP FLAGS': ' '.join(cppflags), 'CPP FLAGS': ' '.join(cppflags),
'C FLAGS, functional': ' '.join(cflags), 'C FLAGS, functional': ' '.join(cflags),
'C FLAGS, warnings': ' '.join(cflags_warn), 'C FLAGS, warnings': ' '.join(cflags_warn),
'C FLAGS, modules': ' '.join(cflags_mod),
'C FLAGS, user specified': ' '.join(get_option('c_args')),
'LD FLAGS': ' '.join(ldflags + get_option('c_link_args')),
}, },
section: 'Compiler Flags', section: 'Compiler Flags',
) )
@ -2982,6 +2985,7 @@ if meson.version().version_compare('>=0.57')
{ {
'C++ FLAGS, functional': ' '.join(cxxflags), 'C++ FLAGS, functional': ' '.join(cxxflags),
'C++ FLAGS, warnings': ' '.join(cxxflags_warn), 'C++ FLAGS, warnings': ' '.join(cxxflags_warn),
'C++ FLAGS, user specified': ' '.join(get_option('cpp_args')),
}, },
section: 'Compiler Flags', section: 'Compiler Flags',
) )

10
src/include/meson.build
View File

@ -42,11 +42,15 @@ config_paths_data.set_quoted('MANDIR', dir_prefix / dir_man)
var_cc = ' '.join(cc.cmd_array()) var_cc = ' '.join(cc.cmd_array())
var_cpp = ' '.join(cc.cmd_array() + ['-E']) var_cpp = ' '.join(cc.cmd_array() + ['-E'])
var_cflags = ' '.join(cflags + cflags_warn) var_cflags = ' '.join(cflags + cflags_warn + get_option('c_args'))
var_cxxflags = ' '.join(cxxflags + cxxflags_warn) if llvm.found()
var_cxxflags = ' '.join(cxxflags + cxxflags_warn + get_option('cpp_args'))
else
var_cxxflags = ''
endif
var_cppflags = ' '.join(cppflags) var_cppflags = ' '.join(cppflags)
var_cflags_sl = '-fPIC' #FIXME var_cflags_sl = '-fPIC' #FIXME
var_ldflags = ' '.join(ldflags) var_ldflags = ' '.join(ldflags + get_option('c_link_args'))
var_ldflags_sl = ''.join(ldflags_sl) var_ldflags_sl = ''.join(ldflags_sl)
var_ldflags_ex = '' # FIXME var_ldflags_ex = '' # FIXME
# FIXME - some extensions might directly use symbols from one of libs. If # FIXME - some extensions might directly use symbols from one of libs. If