Skip to content

Commit

Permalink
add @CMAKE_SYSROOT@ to include and library paths
Browse files Browse the repository at this point in the history
When cross-compiling MariaDB, system paths are returned by the mysql-config
and mariadb-config tools. Add @CMAKE_SYSROOT@ to the paths to avoid this
issue.

Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
  • Loading branch information
ryco-dev committed Feb 11, 2020
1 parent 17ba6af commit 15856fc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mariadb_config/mariadb_config.c.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

static char *mariadb_progname;

#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
#define CFLAGS INCLUDE
#define VERSION "@MARIADB_CLIENT_VERSION@"
Expand Down

0 comments on commit 15856fc

Please sign in to comment.