Commit1330dcd

committed

meson: Include CFLAGS/c_args in summary and pg_config output

Previously arguments passed in via CFLAGS/-Dc_args were neither displayed inmeson'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

1 parent78fdb1e commit1330dcdCopy full SHA for 1330dcd

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2966,6 +2966,9 @@ if meson.version().version_compare('>=0.57')`
`2966`	`2966`	`'CPP FLAGS':''.join(cppflags),`
`2967`	`2967`	`'C FLAGS, functional':''.join(cflags),`
`2968`	`2968`	`'C FLAGS, warnings':''.join(cflags_warn),`
	`2969`	`+'C FLAGS, modules':''.join(cflags_mod),`
	`2970`	`+'C FLAGS, user specified':''.join(get_option('c_args')),`
	`2971`	`+'LD FLAGS':''.join(ldflags+get_option('c_link_args')),`
`2969`	`2972`	`},`
`2970`	`2973`	`section:'Compiler Flags',`
`2971`	`2974`	`)`
`@@ -2982,6 +2985,7 @@ if meson.version().version_compare('>=0.57')`
`2982`	`2985`	`{`
`2983`	`2986`	`'C++ FLAGS, functional':''.join(cxxflags),`
`2984`	`2987`	`'C++ FLAGS, warnings':''.join(cxxflags_warn),`
	`2988`	`+'C++ FLAGS, user specified':''.join(get_option('cpp_args')),`
`2985`	`2989`	`},`
`2986`	`2990`	`section:'Compiler Flags',`
`2987`	`2991`	`)`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,11 +42,15 @@ config_paths_data.set_quoted('MANDIR', dir_prefix / dir_man)`
`42`	`42`
`43`	`43`	`var_cc=''.join(cc.cmd_array())`
`44`	`44`	`var_cpp=''.join(cc.cmd_array()+ ['-E'])`
`45`		`-var_cflags=''.join(cflags+ cflags_warn)`
`46`		`-var_cxxflags=''.join(cxxflags+ cxxflags_warn)`
	`45`	`+var_cflags=''.join(cflags+ cflags_warn+get_option('c_args'))`
	`46`	`+if llvm.found()`
	`47`	`+ var_cxxflags=''.join(cxxflags+ cxxflags_warn+get_option('cpp_args'))`
	`48`	`+else`
	`49`	`+ var_cxxflags=''`
	`50`	`+endif`
`47`	`51`	`var_cppflags=''.join(cppflags)`
`48`	`52`	`var_cflags_sl='-fPIC'#FIXME`
`49`		`-var_ldflags=''.join(ldflags)`
	`53`	`+var_ldflags=''.join(ldflags+get_option('c_link_args'))`
`50`	`54`	`var_ldflags_sl=''.join(ldflags_sl)`
`51`	`55`	`var_ldflags_ex=''# FIXME`
`52`	`56`	`# FIXME - some extensions might directly use symbols from one of libs. If`

Comments

(0)