From 1330dcdec0f22fb2b7a621f9a0e6e729e21d50a4 Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Mon, 26 Sep 2022 19:36:24 -0700 Subject: 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" Discussion: https://postgr.es/m/OS3PR01MB62751847BC9CD2DB7B29AC129E529@OS3PR01MB6275.jpnprd01.prod.outlook.com --- src/include/meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/include/meson.build b/src/include/meson.build index e5390df0584..f2f7d03ff27 100644 --- 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 -- cgit v1.2.3