From 2ab3a0119fadbd5fc8ffbdbca759f35867acd0d2 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Fri, 14 Mar 2025 14:17:17 +0200 Subject: [PATCH] [#3731] Revert mysql fallback to cflags Since mariadb_config does not have --cxxflags. --- subprojects/mysql/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/subprojects/mysql/meson.build b/subprojects/mysql/meson.build index 705d1014e0..e8b0518114 100644 --- a/subprojects/mysql/meson.build +++ b/subprojects/mysql/meson.build @@ -8,12 +8,12 @@ foreach mysql_config_file : ['mariadb_config', 'mysql_config'] if not mysql_config.found() continue endif - cxxflags = run_command([mysql_config, '--cxxflags'], check: false) + cflags = run_command([mysql_config, '--cflags'], check: false) libs = run_command([mysql_config, '--libs'], check: false) version = run_command([mysql_config, '--version'], check: false) - if cxxflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0 - mysql_compile_args = cxxflags.stdout().split() + if cflags.returncode() == 0 and libs.returncode() == 0 and version.returncode() == 0 + mysql_compile_args = cflags.stdout().split() mysql_link_args = libs.stdout().split() mysql_version = version.stdout().strip() mysql = declare_dependency(