diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-13 18:05:27 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-01-13 22:04:36 +0200 |
| commit | aa8e056bab9116586053d2111ef10e2dcf2c913e (patch) | |
| tree | 5c7fda753e7a17f3c8276663b48d497b5063c1d8 | |
| parent | bd59efcdc7494c311cb9db7eedcaa1f986bddbef (diff) | |
Filter out GCC-ism for Clang
At least mariadb-5.5.34-2.fc20.x86_64 "mysql_config --cflags" somewhat
unhelpfully includes GCC-specific -fstack-protector-strong which at least Clang
trunk towards 3.5 does not understand.
Change-Id: Ic38104323b6d9275384effdf21d1885c0720edb0
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 01c66bf42e25..0405e9ba1ef1 100644 --- a/configure.ac +++ b/configure.ac @@ -8261,6 +8261,9 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then fi AC_MSG_CHECKING([for MariaDB Client library]) MARIADB_CFLAGS=`$MARIADBCONFIG --cflags` + if test "$COM_GCC_IS_CLANG" = TRUE; then + MARIADB_CFLAGS=$(printf '%s' "$MARIADB_CFLAGS" | sed -e s/-fstack-protector-strong//) + fi MARIADB_LIBS=`$MARIADBCONFIG --libs_r` AC_MSG_RESULT([includes '$MARIADB_CFLAGS', libraries '$MARIADB_LIBS']) AC_MSG_CHECKING([whether to bundle the MySQL/MariaDB client library]) |