[#3785] Checkpoint

diff --git a/config-report.sh.in b/config-report.sh.in
index 4e42ba19562fe4d0e6559ec78bd0f4a16d7fb19b..e6c24cf40fa9c6f7625d29e208f99748da385d49 100755 (executable)
--- a/config-report.sh.in
+++ b/config-report.sh.in
@@ -21,10 +21,13 @@ Package:
   Hooks directory:   @HOOKS_DIR@
   Premium hooks:     @PREMIUM@
 
-Build Options:     @BUILD_OPTIONS@
 Meson Version:     @MESON_VERSION@
 Meson info:        @MESON_INFO@
+Build Options:     @BUILD_OPTIONS@
+'
+# Break after build options which can embed strange things..
 
+add_to_report '
 C++ Compiler:
   CXX:             @CXX@
   CXX_ID:          @CXX_ID@

diff --git a/meson.build b/meson.build
index 8eac4eacce94ca12e535079038eabe5aa5c8596d..bd2e6babcbec677b23d6d5485f78119a0d6319ce 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -475,8 +475,8 @@ conf_data.set('PACKAGE_VERSION_TYPE', f'"@package_version_type@"')
 
 #### System-specific Compiler Flags
 
-compile_args = get_option('cpp_args')
-link_args = get_option('cpp_link_args')
+compile_args = []
+link_args = []
 
 # $ORIGIN documented at https://www.man7.org/linux/man-pages/man8/ld.so.8.html
 # EXECUTABLE_RPATH = f'$ORIGIN/../@LIBDIR@'
@@ -523,9 +523,10 @@ report_conf_data.set('OS_TYPE', OS_TYPE)
 report_conf_data.set('PREFIX', PREFIX)
 report_conf_data.set('HOOKS_DIR', DEFAULT_HOOKS_PATH)
 report_conf_data.set('PREMIUM', premium ? 'yes' : 'no')
-report_conf_data.set('BUILD_OPTIONS', meson.build_options())
 report_conf_data.set('MESON_VERSION', meson.version())
 report_conf_data.set('MESON_INFO', DATADIR / 'kea/meson-info')
+my_build_options = meson.build_options()
+report_conf_data.set('BUILD_OPTIONS', build_options.replace('\'', '"'))
 report_conf_data.set('CXX', ' '.join(cpp.cmd_array()))
 report_conf_data.set('CXX_ID', cpp.get_id())
 result = run_command(cpp, '--version', check: false)
@@ -545,8 +546,10 @@ if result.returncode() == 0
 else
     error('Cpp standard is unknown')
 endif
+compile_args += get_option('cpp_args')
 report_conf_data.set('CXX_ARGS', ' '.join(compile_args))
 report_conf_data.set('LD_ID', cpp.get_linker_id())
+link_args += get_option('cpp_link_args')
 report_conf_data.set('LD_ARGS', ' '.join(link_args))
 report_conf_data.set('PYTHON_PATH', PYTHON.full_path())
 report_conf_data.set('PYTHON_VERSION', PYTHON.version())