meson: Include CFLAGS/c_args in summary and pg_config output

anarazel · anarazel · commit 1330dcdec0f2 · 2022-09-26T19:36:24.000-07:00
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
diff --git a/meson.build b/meson.build
@@ -2966,6 +2966,9 @@ if meson.version().version_compare('>=0.57')
       'CPP FLAGS': ' '.join(cppflags),
       'C FLAGS, functional': ' '.join(cflags),
       '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',
   )
@@ -2982,6 +2985,7 @@ if meson.version().version_compare('>=0.57')
       {
         'C++ FLAGS, functional': ' '.join(cxxflags),
         'C++ FLAGS, warnings': ' '.join(cxxflags_warn),
+        'C++ FLAGS, user specified': ' '.join(get_option('cpp_args')),
       },
       section: 'Compiler Flags',
     )
diff --git a/src/include/meson.build b/src/include/meson.build
@@ -42,11 +42,15 @@ config_paths_data.set_quoted('MANDIR', dir_prefix / dir_man)
 
 var_cc = ' '.join(cc.cmd_array())
 var_cpp = ' '.join(cc.cmd_array() + ['-E'])
-var_cflags = ' '.join(cflags + cflags_warn)
-var_cxxflags = ' '.join(cxxflags + cxxflags_warn)
+var_cflags = ' '.join(cflags + cflags_warn + get_option('c_args'))
+if llvm.found()
+  var_cxxflags = ' '.join(cxxflags + cxxflags_warn + get_option('cpp_args'))
+else
+  var_cxxflags = ''
+endif
 var_cppflags = ' '.join(cppflags)
 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_ex = '' # FIXME
 # FIXME - some extensions might directly use symbols from one of libs. If

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`	`)`